Merge "FVP: Fix incorrect GIC mapping" into integration