Revert "media: Avoid collision with FFMPEG plugin"

This reverts commit deb5e8ff7a8b85967b658171b1856e462d3d2346.
This can be readded if/when we add ffmpeg support

Change-Id: Idc7993f1fc79ccdaf0a9d2009ada36e080ebcc23