Android and Linux fixes
Merge pull request #4538 from ricardoquesada/linux_and_android_fixes

Android and Linux fixes