Merge "fix(zynqmp): fix bl31_zynqmp_setup.c coding style" into integration