Rename env var to match new output folder of latest SDK

build/android/buildbot.sh

 #!/bin/bash
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # "compile and run tests" script for the android build of chromium.
 # Intended for use by buildbot.
 # At this time, we only have one bot which is both a builder and
 # tester.  Script assumes it runs in the "build" directory.
 #
@@ skipping 18 matching lines @@
   echo "Disabling experimental builds and tests since we are a trybot."
   BUILD_EXPERIMENTAL_TARGETS=0
   RUN_TESTS=0
 fi
 
 echo "@@@BUILD_STEP cd into source root@@@"
 SRC_ROOT=$(cd "$(dirname $0)/../.."; pwd)
 cd $SRC_ROOT
 
 echo "@@@BUILD_STEP Basic setup@@@"
-export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux_x86
+export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
 export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
 for mandatory_directory in "${ANDROID_SDK_ROOT}" "${ANDROID_NDK_ROOT}" ; do
   if [[ ! -d "${mandatory_directory}" ]]; then
     echo "Directory ${mandatory_directory} does not exist."
     echo "Build cannot continue."
     exit 1
   fi
 done
 
 if [ ! "$BUILDBOT_CLOBBER" = "" ]; then
@@ skipping 30 matching lines @@
     set -e
   done
 fi
 
 if [ "${RUN_TESTS}" = 1 ] ; then
   echo "@@@BUILD_STEP Run Tests@@@"
   build/android/run_tests.py -e --xvfb --verbose
 fi
 
 exit 0