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