Merge "hwc test: 64-bit compilation error"