Track CM external ffmpeg and stagefright-plugins

This reverts commit 9ac6cbce24081421f34382afe06c51fea6ddd31f.