Merge "Fix warnings in libziparchive"