diff --git a/platform_tools/android/bin/android_gdb_native b/platform_tools/android/bin/android_gdb_native
index a6d748c..bf6827a 100755
--- a/platform_tools/android/bin/android_gdb_native
+++ b/platform_tools/android/bin/android_gdb_native
@@ -45,8 +45,7 @@
 
 # Launch gdb client
 echo "Entering gdb client shell"
-GDB_COMMAND=$(command ls "$ANDROID_TOOLCHAIN"/*-gdb | head -n1)
-"$GDB_COMMAND" -x $GDBSETUP
+$ANDROID_TOOLCHAIN/../gdb -x $GDBSETUP
 
 # Clean up:
 # We could 'rm -rf $GDB_TMP_DIR', but doing so would cause subsequent debugging
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh
index 93322da..c2c6a52 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -53,13 +53,14 @@
     pushd $TOOLCHAINS
     curl -o $NDK.zip https://dl.google.com/android/repository/android-ndk-$NDK-$HOST-x86_64.zip
     unzip $NDK.zip
-    UNZIPPED=android-ndk-$NDK-$HOST-x86_64.tar.bz2
+    UNZIPPED=android-ndk-$NDK
     ./$UNZIPPED/build/tools/make-standalone-toolchain.sh \
         --use-llvm              \
         --arch=$ANDROID_ARCH    \
         --platform=android-$API \
         --install_dir=$TOOLCHAIN
     cp $UNZIPPED/prebuilt/android-$ANDROID_ARCH/gdbserver/gdbserver $TOOLCHAIN
+    cp $UNZIPPED/prebuilt/${HOST}-x86_64/bin/gdb $TOOLCHAIN
     rm $NDK.zip
     rm -rf $UNZIPPED
     popd