Merge "plat: Fix build issue for qemu and rpi3 platforms" into integration