Merge "Remove vr_hwc."