am 48948e10: am f3694fc1: am 98840f2b: Merge "media: add support for 160-byte image info in MediaCodec"

* commit '48948e10b33b578a6ac405a15740f72574b54a2b':
  media: add support for 160-byte image info in MediaCodec