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