Merge "Update SMCCC_ARCH_SOC_ID test case"