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