Merge "Stagefright: MediaCodec: shutdown allocated codec on error" into lmp-dev