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

Change-Id: I4fe5a70c750328bb67cdc02a08e4f9eeb97ac20d