Merge "Remove USE_HWC2 usage" am: 8757179e52
am: 70a2813e86

Change-Id: Ida5cf0bb3a644e29c9216fabb89670bf4ec58220