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

Change-Id: Iebca19f2757ae77c07eca46a721c6966621fea14