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

Change-Id: I921dbfbb075975cca1559d18986c283701d306ef