tuna: add ffmpeg codecs

Change-Id: I7238b699a69f8ebb8b8b7aa70d359936653a56fc
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

Conflicts:
	media_codecs.xml

Change-Id: I79ea5dd0babc4f28767dc055e4ed5e940a02bfc1