Merge "hwc: Changes for CFI compliance"