Merge "FVP: Fix BL31 load address and image size for RESET_TO_BL31=1" into integration