Merge "Fix MediaCodec.flush()" into jb-mr2-dev