Merge "Change ZipArchiveHandle from void* to ZipArchive*"
am: c394f7f7ac

Change-Id: I59e9163e3c9c2a0baf21de1ccc9703406a687965