Fix mac NDK builds

platform_tools/android/bin/utils/setup_toolchain.sh

 #!/bin/bash
 #
 # setup_toolchain.sh: Sets toolchain environment variables used by other scripts.
 
 # Fail-fast if anything in the script fails.
 set -e
 
 # check that the preconditions for this script are met
 if [ $(type -t verbose) != 'function' ]; then
   echo "ERROR: The verbose function is expected to be defined"
@@ skipping 21 matching lines @@
   
   if [[ $ANDROID_ARCH == *64* ]]; then
     API_LEVEL=L # Experimental Android L-Release system images
   else
     API_LEVEL=14 # Official Android 4.0 system images  
   fi
 
   TOOLCHAIN_DIR=${SCRIPT_DIR}/../toolchains
   if [ $(uname) == "Darwin" ]; then
     verbose "Using Mac toolchain."
-    TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-mac_v$API_LEVEL
+    TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-darwin_v$API_LEVEL
   else
     verbose "Using Linux toolchain."
     TOOLCHAIN_TYPE=ndk-r$NDK_REV-$ANDROID_ARCH-linux_v$API_LEVEL
   fi
   exportVar ANDROID_TOOLCHAIN "${TOOLCHAIN_DIR}/${TOOLCHAIN_TYPE}/bin"
 
   # if the toolchain doesn't exist on your machine then we need to fetch it
   if [ ! -d "$ANDROID_TOOLCHAIN" ]; then
     mkdir -p $TOOLCHAIN_DIR
     # enter the toolchain directory then download, unpack, and remove the tarball
@@ skipping 38 matching lines @@
 exportVar AR "$ANDROID_TOOLCHAIN_PREFIX-ar"
 exportVar RANLIB "$ANDROID_TOOLCHAIN_PREFIX-ranlib"
 exportVar OBJCOPY "$ANDROID_TOOLCHAIN_PREFIX-objcopy"
 exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip"
 
 # 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.
 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
 exportVar PATH $ANDROID_TOOLCHAIN:$PATH