media: Avoid collision with FFMPEG plugin

Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_media into cm-11.0