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