am 48a6d3de: am ac3ab308: Merge "Fix Mac OS build for libziparchive."

* commit '48a6d3de590714f4e913c6cc3135a455126df91d':
  Fix Mac OS build for libziparchive.