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

* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
  camera2: Fix native ImageReader test segfaults.