am 4b3d6d88: am 164c75d4: Merge "Camera2: Add support for preview callbacks" into jb-mr1-dev

* commit '4b3d6d881be4caba2c2a3b7cbbcb36d618aeee43':
  Camera2: Add support for preview callbacks