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

* commit '164c75d47081e714b1a0b537b2b509d5ba9a4dd2':
  Camera2: Add support for preview callbacks