Merge "Omit module-info.class when unzipping jar files."