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