Merge pull request #1028 from Sonicadvance1/fix-android-cmake Fix a few minor bugs that appeared in the latest android cmake script
