Merge "Replace minzip with libziparchive"