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

* commit 'cd3fc4e341abc224db6876c5a028cb94606dc4e8':
  Stagefright: MediaCodec: shutdown allocated codec on error