Enable use of FFMPEG codecs for extended formats

Change-Id: I1dc66749b6b5548c3617cbbfff389abc3d319562
Merge branch 'cm-11.0' into kk_mkt