Merge "media: prepare for Codec 2.0" into pi-dev
am: 9e4a3b8907

Change-Id: I2cc4b64f8a19842c2b8dc41eff2d32a5323f7d65