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

* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
  Fix Mac OS build for libziparchive.