Merge "plat: xilinx: Fix non-MISRA compliant code" into integration