Revert "media-caf: Avoid collision with FFMPEG plugin"

This reverts commit dab6ad4665dcfaaf1be426c4e35da61f735f7f09.