Merge "fix(fvp): work around BL31 progbits exceeded" into integration