Merge "Remove unused field from MediaMuxer"