Merge "libziparchive: 64 bit issues"