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