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

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