Merge "revert(zynqmp): remove EM SMC handler" into integration