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