am 563c374f: am f4d6f153: Merge "remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT" into jb-mr2-dev

* commit '563c374faf2c9e2741e0c73edff22237aa0562e5':
  remove suppor for SurfaceControl.FX_SURFACE_SCREENSHOT