fixed warnings on Android and windows
Merge pull request #3307 from minggo/develop

fixed warnings on Android and windows