Merge "hwc: Fix compiler warning"