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

This reverts commit a851e4f7b8be2b8f82e9851027e15c753c9c9a41.