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

* commit '6ce19d24ff985cf845f04c2d6542ce03c7d07964':
  Stagefright: MediaCodec: shutdown allocated codec on error