Merge changes Id4222c9b,I3c1a9172

* changes:
  More clean-up. Get rid off the "blur" effect in SurfaceFlinger
  fix [3259708] Graphic Buffer Mapper does not support YV12