Merge "FVP: Stop reclaiming init code with Clang builds" into integration