Merge "fix(arm): fix GIC macros for GICv4.1 support" into integration