Merge pull request #3765 from sigmabeta/fix-android-builds-permanently [Android] Fix android builds permanently.