Merge "Fix casting bug in gicv2_main.c" into integration