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

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