am fe028e58: am 089edf2e: Merge "Fix MediaCodec.flush()" into jb-mr2-dev

* commit 'fe028e58782566bd1a8bf9209848c2b00f2b339c':
  Fix MediaCodec.flush()