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

* commit '26cb5fd5fffb2204ec12994cacb3b32639eb4d59':
  media: Update ImageReader APIs