Merge changes I4589e02a,Id300e8b2 into nyc-dev

* changes:
  Switch SurfaceFlinger to HWC 2.0
  HWC2On1Adapter: Initialize variables and fix mutex