Revert "media: Avoid collision with FFMPEG plugin"

This reverts commit 443849aea9b41d830a524e07d88015c7913c8ae3.

Change-Id: I42fa743d6c8313ef79b497911a11f5952f781b59