Merge "Change ZipArchiveHandle from void* to ZipArchive*" am: c394f7f7ac am: 50b0e1de48
am: 4a17644041

Change-Id: Idea1a63090ecc596aed7385ffa65a759ccf23098