am cb42f317: Merge "Camera3: Improve error logging" into jb-mr2-dev

* commit 'cb42f317876ff42ed2b7de432b87d0486c385eb7':
  Camera3: Improve error logging