Merge "Expose functions used to add entries to the zip file." into nyc-dev