Merge "Change ZipArchiveHandle from void* to ZipArchive*"