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