Update android toolchain variable to point to root dir and not the bin

platform_tools/android/bin/utils/setup_toolchain.sh

Index: platform_tools/android/bin/utils/setup_toolchain.sh
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh
index 89c245aa10f603a222f5d50a9967c0de98b2bdef..50098ba34a2ab82271c17be1a3a5077c7f7119aa 100755
--- a/platform_tools/android/bin/utils/setup_toolchain.sh
+++ b/platform_tools/android/bin/utils/setup_toolchain.sh
@@ -46,7 +46,7 @@ function default_toolchain() {
   TOOLCHAIN=$ANDROID_ARCH-$NDK-$API
   HOST=`uname | tr '[A-Z]' '[a-z]'`
 
-  exportVar ANDROID_TOOLCHAIN "${TOOLCHAINS}/${TOOLCHAIN}/bin"
+  exportVar ANDROID_TOOLCHAIN "${TOOLCHAINS}/${TOOLCHAIN}"
 
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     mkdir -p $TOOLCHAINS
@@ -78,9 +78,9 @@ if [ -z "$ANDROID_TOOLCHAIN" ]; then
   fi
 fi
 
-GCC=$(command ls $ANDROID_TOOLCHAIN/*-gcc | head -n1)
+GCC=$(command ls $ANDROID_TOOLCHAIN/bin/*-gcc | head -n1)
 if [ -z "$GCC" ]; then
-  echo "ERROR: Could not find Android cross-compiler in: $ANDROID_TOOLCHAIN"
+  echo "ERROR: Could not find Android cross-compiler in: ${ANDROID_TOOLCHAIN}/bin"
   return 1
 fi
 
@@ -149,4 +149,4 @@ if [ $(uname) == "Darwin" ]; then
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as
 fi
 
-exportVar PATH $ANDROID_TOOLCHAIN:$PATH
+exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH}