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

Change-Id: I8e87f4661e51b422886c72ef506f196608a32a42