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

Change-Id: I8aa710cb6df1ba5b2079c5e3d9a70b365815d04e