Merge pull request #1097 from davidcunado-arm/dc/reset_bl31

plat/arm: Fix BL31_BASE when RESET_TO_BL31=1