Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev