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

* commit '258420480e1edc73b112a5994a8456e31c558860':
  stagefright: try to free codec instance if MediaCodec.release hangs