Merge pull request #1613 from Sonicadvance1/update_android_cmake Update the android cmake toolchain to latest.