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