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

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