Merge "ZipUtils: Rewrite in terms of zip_archive::Inflate."