otter-common: Fix up use of FFMPEG codecs

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