Merge "Make ZipEntryTest time-insensitive"