Build fixes:

    current NDK versions of make_standalone_toolchain.py now
    correctly copy the sysroot header files.

    current NDK versions do not include tts.h.

Author: gmp216

android/android.go

@@ -22,7 +22,6 @@ package android
 #include <android/rect.h>
 #include <android/sensor.h>
 #include <android/storage_manager.h>
-#include <android/tts.h>
 #include <android/window.h>
 #include <jni.h>
 #include "jni_call.h"

android/cgo_helpers.go

@@ -22,7 +22,6 @@ package android
 #include <android/rect.h>
 #include <android/sensor.h>
 #include <android/storage_manager.h>
-#include <android/tts.h>
 #include <android/window.h>
 #include <jni.h>
 #include "jni_call.h"

android/cgo_helpers.h

@@ -18,7 +18,6 @@
 #include <android/rect.h>
 #include <android/sensor.h>
 #include <android/storage_manager.h>
-#include <android/tts.h>
 #include <android/window.h>
 #include <jni.h>
 #include "jni_call.h"

android/const.go

@@ -22,7 +22,6 @@ package android
 #include <android/rect.h>
 #include <android/sensor.h>
 #include <android/storage_manager.h>
-#include <android/tts.h>
 #include <android/window.h>
 #include <jni.h>
 #include "jni_call.h"

android/types.go

@@ -22,7 +22,6 @@ package android
 #include <android/rect.h>
 #include <android/sensor.h>
 #include <android/storage_manager.h>
-#include <android/tts.h>
 #include <android/window.h>
 #include <jni.h>
 #include "jni_call.h"

example-egl/bash_script/build_toolchain.sh

@@ -48,9 +48,6 @@ set -x
 "$ANDROID_HOME"/ndk-bundle/build/tools/make_standalone_toolchain.py \
 		--api=$ANDROID_API --install-dir=$TOOLCHAIN_DIR \
 		--arch=$ARCH --stl libc++
-# The command above includes the wrong headers due to a bug in the android sdk and/or cmake. The following two commands fix this issue.
-rm -rf "$TOOLCHAIN_DIR/sysroot/usr"
-cp -r  "$ANDROID_HOME/ndk-bundle/platforms/android-$ANDROID_API/arch-$ARCH/usr" "$TOOLCHAIN_DIR/sysroot/usr"
 set +x
 printf "Standalone toolchain ready\n"
-done
+done

examples/build-android.sh

@@ -27,9 +27,6 @@ $ANDROID_HOME/tools/bin/sdkmanager "ndk-bundle"
 # Create native android toolchain
 rm -rf android/toolchain
 $ANDROID_NDK_HOME/build/tools/make_standalone_toolchain.py --install-dir=android/toolchain --arch=arm --api=$ANDROID_API  --stl=libc++
-# The command above includes the wrong headers due to a bug in the android sdk and/or cmake. The following two commands fix this issue.
-rm -rf android/toolchain/sysroot/usr
-cp -r  "$ANDROID_NDK_HOME/platforms/android-$ANDROID_API/arch-arm/usr" "android/toolchain/sysroot/usr"
 
 # Build .so
 mkdir -p android/app/src/main/jniLibs/armeabi-v7a