Merge "plat/meson/gxl: BL31: remove BL2 dependency" into integration