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

* commit '5bb603c1e1984dcac0bc7b0e4f82c623710d54a8':
  Make sure MediaCodec::stop() and MediaCodec::release() still return