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

Change-Id: I5faccd8f99ec13880715853a1d46cc06e5cc11bd