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

* commit '3d2ad1eafd6b2ea1ad92951f6f6c448760bc7895':
  libziparchive: off64_t is not int64_t