am e68eb9b8: am 9942f62d: Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev

* commit 'e68eb9b82d0371324add708e2b2eb45a99ddbd70':
  Camera2: Include JPEG settings in ZSL requests.