Merge changes I09f4a157,I738be45b

* changes:
  [SurfaceFlinger] Remove saturation matrix of Adaptive mode.
  [SurfaceFlinger] Remove usage of legacy data spaces.