Merge "BL31: Fix relocation error for PIE" into integration