Revert "stagefright: Resolve turf war between FFMPEG and mm-parser"

This reverts commit dd3d11107ad4fd9e8cad5c10c3975e45a8fc08d5.

Change-Id: I833e7b6ac5c05732de03481d183f5a5889d6e438