Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9' * commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9': Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9' * commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9': Make stagefright a little less verbose. Fix heap corruption for real.