Merge "Libziparchive: Remove unused variable"