Merge pull request #1034 from Sonicadvance1/fix-android-arm-ndk64bit Fix building ARMv7 on the 64bit Android NDK.
