Merge "Fix Win32 <ziparchive/zip_archive.h>."