Merge "Fix SMCCC_ARCH_SOC_ID implementation" into integration