compiles on Android

compiles on Android
Merge pull request #5104 from ricardoquesada/android_compile_fixes

compiles on Android