Merge "Remove USE_HWC2 usage"
am: 8757179e52

Change-Id: I58fbf7213d42d4b81379464051fff5ba56b99063