Merge changes I5c071453,Icda681bf

* changes:
  graphics: rewrite libgralloc1-adapter
  graphics: copy Gralloc1On0Adapter over