am 720b1fce: am 26cb5fd5: Merge "media: Update ImageReader APIs" into klp-dev

* commit '720b1fcecd6c21bf4fbe6d3822e52c8a092b93c4':
  media: Update ImageReader APIs