Merge "arm_fpga: adapt to new way of including gicv3 files" into integration