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