Merge "Revert "Make ZipEntryTest time-insensitive""