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