Merge "feat(zynqmp): add SMCCC_ARCH_SOC_ID support" into integration