Merge "refactor(xilinx): rename gic macros to make common" into integration