Do not set ANDROID_SDK_ROOT so it uses default from android_tools.

BUG=


Review URL: https://chromiumcodereview.appspot.com/10823107

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149280 0039d316-1c4b-4281-b951-d872f2087c98

build/android/buildbot_functions.sh

@@ -35,11 +35,11 @@ function bb_parse_args {
 }
 
 
-# Setup environment for Android build.
+# Setup environment for Android build.  Do not set ANDROID_SDK_ROOT so that
+# default version from $ROOT/src/third_party/android_tools/
 # Called from bb_baseline_setup.
 # Moved to top of file so it is easier to find.
 function bb_setup_environment {
-  export ANDROID_SDK_ROOT=/usr/local/google/android-sdk-linux
   export ANDROID_NDK_ROOT=/usr/local/google/android-ndk-r7
 }