Merge "Change ZipArchiveHandle from void* to ZipArchive*"
am: 17c5e022f4

Change-Id: I357255671e5ec4ab4663e27c3f48332ec6ace5cb