Fixed issues with new sysinfo on windows
cmake: Fix for monolithic Android build
Merge pull request #1026 from mfleisz/sysinfofix

Fixed sysinfo issues with Win32 builds