Merge pull request #2597 from endrift/android-allow-ndk-override Android: Allow NDK location to be specified manually
