Merge "Remove reference to libzipfile."