Build-fix for Android.
Merge pull request #5659 from thedax/androidBuildFix

Build-fix for Android.