Fix android build on windows
merge with master for CI on osx