Merge pull request #1486 from akallabeth/android_build_enhanced