Merge "plat: xilinx: versal: Remove code duplication" into integration