Merge "hwc: Use proper typecasts"