Merge "Add libziparchive explicitly."