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

* commit 'b845c6b0c3066d6791973be830f0953477461a65':
  Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""