am 7ad09634: Merge "libziparchive: 64 bit compile issues"

* commit '7ad096340fd5170267b12a6bd577e9d30353564f':
  libziparchive: 64 bit compile issues