Merge changes I8cc3ce7d,Ie1a7bfd2,Id472ed4e into nyc-dev
am: a4c2c3ba1e

* commit 'a4c2c3ba1ed2d741edfa652bf8f2bab229389e8e':
  libgui: Allow for pending releases in GLConsumer
  SF: HWC2 C++ shim
  SF: HWC2On1Adapter