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