Merge "hwui: 64-bit compile issue"