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

platform_tools/android/bin/utils/setup_toolchain.sh

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #!/bin/bash
 #
 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts.
 
 # Fail-fast if anything in the script fails.
@@ skipping 28 matching lines @@
 
   if [[ $ANDROID_ARCH == *64* ]]; then
       API=21  # Android 5.0
   else
       API=14  # Android 4.0
   fi
 
   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
     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
     ./$UNZIPPED/build/tools/make-standalone-toolchain.sh \
         --use-llvm              \
         --arch=$ANDROID_ARCH    \
@@ skipping 11 matching lines @@
 
 #check to see if the toolchain has been defined and if not setup the default toolchain
 if [ -z "$ANDROID_TOOLCHAIN" ]; then
   default_toolchain
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     echo "ERROR: unable to download/setup the required toolchain (${ANDROID_TOOLCHAIN})"
     return 1;
   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
 
 # Remove the '-gcc' at the end to get the full toolchain prefix
 ANDROID_TOOLCHAIN_PREFIX=${GCC%%-gcc}
 
 CCACHE=${ANDROID_MAKE_CCACHE-$(which ccache || true)}
 
 # Cross compiling Android on Mac is not currently supported by gyp.
 # It doesn't appear to be supported on Windows either.
@@ skipping 48 matching lines @@
 
 # Create symlinks for nm & readelf and add them to the path so that the ninja
 # build uses them instead of attempting to use the one on the system.
 # This is required to build using ninja on a Mac.
 if [ $(uname) == "Darwin" ]; then
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-nm $ANDROID_TOOLCHAIN/nm
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-readelf $ANDROID_TOOLCHAIN/readelf
   ln -sf $ANDROID_TOOLCHAIN_PREFIX-as $ANDROID_TOOLCHAIN/as
 fi
 
-exportVar PATH $ANDROID_TOOLCHAIN:$PATH
+exportVar PATH ${ANDROID_TOOLCHAIN}/bin:${PATH}