Merge "bl2_el3: clean up linker script" into integration