Merge "libziparchive: off64_t is not int64_t"