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

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