Merge "plat/arm: Fix build failure due to increase in BL2 size" into integration