Merge "hwc: resolve compiler warnings"