am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev

* commit '9b89c15d9d8abb9408760ffdb022df4c4367685b':
  camera3: Fix zsl buffers released-while-in-use race condition