Revert "media: Avoid collision with FFMPEG plugin"

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

Change-Id: Ie1ca9c2934f3cfd2ba9ac0a7f3eb5dedd30d4956