am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release()...
am 2c157e0f: Merge "Make sure MediaCodec::stop() and MediaCodec::release() still return" into jb-mr2-dev
* commit '2c157e0f':
Make sure MediaCodec::stop() and MediaCodec::release() still return