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

* commit '089edf2e227c72b7ff4fd9b9ed96320e21811d50':
  Fix MediaCodec.flush()