am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev

* commit '3ed95fe2589c01e9255f4d75636fb8b0c83a01d5':
  media: add support for 160-byte image info in MediaCodec