Revert "Use checked in android_tools Android NDK."

build/android/buildbot_functions.sh

Index: build/android/buildbot_functions.sh
diff --git a/build/android/buildbot_functions.sh b/build/android/buildbot_functions.sh
index f5aabdc694979d93151ee13d396f64c4eb0890ee..a848d28264faed37ea9a567dfa697aee1ad6591b 100755
--- a/build/android/buildbot_functions.sh
+++ b/build/android/buildbot_functions.sh
@@ -34,6 +34,15 @@ function bb_parse_args {
   done
 }
 
+
+# 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_NDK_ROOT=/usr/local/google/android-ndk-r7
+}
+
 # Function to force-green a bot.
 function bb_force_bot_green_and_exit {
   echo "@@@BUILD_STEP Bot forced green.@@@"
@@ -70,6 +79,8 @@ function bb_baseline_setup {
     return 1
   fi
 
+  bb_setup_environment
+
   for mandatory_directory in $(dirname "${ANDROID_SDK_ROOT}") \
     $(dirname "${ANDROID_NDK_ROOT}") ; do
     if [[ ! -d "${mandatory_directory}" ]]; then