am c763303e: (-s ours) am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]

* commit 'c763303eca5acf56a6d45157106d6277fb0887ab':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]