Merge "libziparchive: fix clang build"