Merge "Fix a few issues in MediaMuxerTest."