am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL...
am 2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev
* commit '2628bc9d':
camera3: Don't crash when taking a still capture with ZSL disabled