am a510099d: am c85c0d96: (-s ours) Merge "Stagefright: Remove unused...
am a510099d: am c85c0d96: (-s ours) Merge "Stagefright: Remove unused variables and files" into mnc-dev-plus-aosp
* commit 'a510099d':
Stagefright: Remove unused variables and files