Merge "hwc: Remove unused utility function"