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

This reverts commit 54a5b72ca28d8fef52da7ce60bdce4d4db3b3689.