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

* commit '2c157e0f127f36b4c709508f899c2a9f32ba3bd4':
  Make sure MediaCodec::stop() and MediaCodec::release() still return