am ba5f10a5: Merge "libziparchive: fix clang build"

* commit 'ba5f10a565f0ba79bf72456852665e705de3b381':
  libziparchive: fix clang build