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

* commit '98840f2bd2fb96225ed5c95644937d55d4189ca6':
  media: add support for 160-byte image info in MediaCodec