Fix Android(and probably others) build.
Merge pull request #3966 from thedax/fixAndroidBuild

Fix Android(and probably others) build.