am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev

* commit '174355d605ba1314f5ca024fde776ec03a9a2042':
  camera2: Fix native ImageReader test segfaults.