Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: f79542efd3
am: a34a1e0c97

Change-Id: Icf0d62124d88c87a76edcb9af945a2f327989a15