media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge remote-tracking branch 'cyan/cm-12.0-caf-8960' into cm-12.0-caf-8660