am fff97293: am cb66d22f: Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev

* commit 'fff97293d56ca9869004f89ce46c2b337d7f57e7':
  Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.