diff --git a/.travis.yml b/.travis.yml
index a25f2e67..3dc8d39c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,7 +76,7 @@ before_install:
       source scripts/android-setup.sh && installAndroidSDK
       export ANDROID_SDK=$ANDROID_HOME
       export ANDROID_NDK_REPOSITORY=$HOME/android-ndk
-      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r13b
+      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r15c
     fi
 
   # JavaScript
diff --git a/scripts/android-setup.sh b/scripts/android-setup.sh
index 72fd198f..fb32766f 100644
--- a/scripts/android-setup.sh
+++ b/scripts/android-setup.sh
@@ -1,8 +1,9 @@
 function download() {
+  echo "Downloading '$1' to '$2' ..."
   if hash curl 2>/dev/null; then
-    curl -L -o $2 $1
+    curl --retry 10 -L -o "$2" "$1"
   elif hash wget 2>/dev/null; then
-    wget -O $2 $1
+    wget -O "$2" "$1"
   else
     echo >&2 "No supported download tool installed. Please get either wget or curl."
     exit