Merge "Remove USE_HWC2 usage"