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