Merge "Remove libziparchive dependency on libutils"