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

* commit 'c6c331ee6ef9dbcd8e54a1a915d5932a6dda5405':
  camera2: Fix native ImageReader test segfaults.