am 8b622fe3: (-s ours) am 10665f4b: Merge "Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE" into jb-mr1-aah-dev

* commit '8b622fe360e4c635fae9f8ecd8b2d88ef015af93':
  Camera2: Fix a potential race condition in the readout thread: DO NOT MERGE