Merge "Fix Win32 build."