Upstream recent downstream changes in envsetup.sh.

build/android/envsetup.sh

Index: build/android/envsetup.sh
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index 390f07cebbb7ebf29cc005bb5eb92044c6371c54..9d1b7e6fef8857b5d47afb3dd8288031ba1e1226 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -10,12 +10,17 @@
 # ANDROID_SDK_BUILD=1 will then be defined and used in the rest of the setup to
 # specifiy build type.
 
+# Source functions script.  The file is in the same directory as this script.
+. "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
+
+export ANDROID_SDK_BUILD=1  # Default to SDK build.
+
+process_options "$@"
+
 # When building WebView as part of Android we can't use the SDK. Other builds
 # default to using the SDK.
 if [[ "${CHROME_ANDROID_BUILD_WEBVIEW}" -eq 1 ]]; then
   export ANDROID_SDK_BUILD=0
-else
-  export ANDROID_SDK_BUILD=1
 fi
 
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
@@ -55,11 +60,7 @@ fi
 # Android sdk platform version to use
 export ANDROID_SDK_VERSION=16
 
-# Source functions script.  The file is in the same directory as this script.
-. "$(dirname $BASH_SOURCE)"/envsetup_functions.sh
-
 if [[ "${ANDROID_SDK_BUILD}" -eq 1 ]]; then
-  process_options "$@"
   if [[ -z "${TARGET_ARCH}" ]]; then
     return 1
   fi