Use a different download URL for Android toolchains

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 47 matching lines @@
   fi
 
   # 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
     pushd $TOOLCHAIN_DIR
     TARBALL=ndk-r$NDK_REV-v$API_LEVEL.tgz
 
     ${SCRIPT_DIR}/download_toolchains.py \
-        http://chromium-skia-gm.commondatastorage.googleapis.com/android-toolchains/$TARBALL \
+        http://storage.googleapis.com/chromium-skia-gm/android-toolchains/$TARBALL \
         $TOOLCHAIN_DIR/$TARBALL
     tar -xzf $TARBALL $TOOLCHAIN_TYPE
     rm $TARBALL
     popd
   fi
 
   verbose "Targeting NDK API $API_LEVEL (NDK Revision $NDK_REV)"
 }
 
 #check to see if the toolchain has been defined and if not setup the default toolchain
@@ skipping 74 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