Revert "cm: Underp package names"

This reverts commit d2a375f9e6b50a2992cfe39b415cf7a2a8d558e9.
Revert "cm: Build Stagefright FFMPEG plugin"

This reverts commit f6a5d66890d41310e0f0abab630080a32a754793.