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

Change-Id: I3c0f754ee0fdea0373293f06081b4a3230b87e09