Update native with Win32 buildfix.
Merge pull request #4728 from thedax/win32Buildfix

Update native with Win32 buildfix.