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

Change-Id: I61cee0ba3cd640e914583daae64d522cc250603e