Merge pull request #3862 from sigmabeta/android-new-ndk [Android] Fix builds when using newest version of NDK
