Merge "TF-A: Fix BL31 linker script error" into integration