am da2046f9: am 3d2ad1ea: am f304730c: Merge "libziparchive: off64_t is not int64_t"

* commit 'da2046f9829b87405509b52365e6747f95246458':
  libziparchive: off64_t is not int64_t