Merge "Plat FVP: Fix Generic Timer interrupt types" into integration