Merge "plat/arm: Disable SMCCC_ARCH_SOC_ID feature" into integration