am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated...
am cd3fc4e3: am 6ce19d24: Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev
* commit 'cd3fc4e3':
Stagefright: MediaCodec: shutdown allocated codec on error