Merge "Add CTS tests for MediaCodec.flush()" into jb-mr2-dev