am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if...
am f04e8b5e: am 25842048: Merge "stagefright: try to free codec instance if MediaCodec.release hangs" into lmp-dev
* commit 'f04e8b5e':
stagefright: try to free codec instance if MediaCodec.release hangs