Enable use of FFMPEG codecs for extended formats and some cleaning

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