diff --git a/android/adb_install_content_shell b/android/adb_install_content_shell
index b4d805213..d1a8ee965 100755
--- a/android/adb_install_content_shell
+++ b/android/adb_install_content_shell
@@ -4,4 +4,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# install -r doesn't always work?  Try uninstalling first.
+adb uninstall org.chromium.content_shell
 adb install -r ${CHROME_SRC}/out/Release/content_shell/ContentShell-debug.apk 
diff --git a/android/envsetup.sh b/android/envsetup.sh
index ead8fdf46..dcf51ee13 100755
--- a/android/envsetup.sh
+++ b/android/envsetup.sh
@@ -62,6 +62,14 @@ case "${TARGET_PRODUCT-full}" in
     return 1
 esac
 
+# If we are building NDK/SDK, and in the upstream (open source) tree,
+# define a special variable for bringup purposes.
+case "${ANDROID_BUILD_TOP-undefined}" in
+  "undefined")
+    DEFINES+=" android_upstream_bringup=1"
+    ;;
+esac
+
 toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}/prebuilt/"
 export ANDROID_TOOLCHAIN="${toolchain_path}/${toolchain_dir}/bin/"
 
diff --git a/android/gdb_content_shell b/android/gdb_content_shell
index 54a705d42..94c096287 100755
--- a/android/gdb_content_shell
+++ b/android/gdb_content_shell
@@ -72,8 +72,9 @@ fi
 # gdb commands
 cmdfile=$(mktemp /tmp/gdb_android_XXXXXXXX)
 cat >$cmdfile<<EOF
-set solib-absolute-prefix null
+# set solib-absolute-prefix null
 set solib-search-path ${shared_lib_dir}
+file ${app_process}
 target remote :4321
 EOF
 
@@ -85,5 +86,6 @@ else
   echo Using $gdb
 fi
 
-${gdb} -x $cmdfile $* $app_process
+# ${gdb} -x $cmdfile $* $app_process
+${gdb} -x $cmdfile $*
 rm $cmdfile
diff --git a/common.gypi b/common.gypi
index 7e999a7c5..b79ae1b1b 100644
--- a/common.gypi
+++ b/common.gypi
@@ -47,6 +47,11 @@
           # Enable inclusion of touch-optimized resources.
           # TODO(joi): Rename to enable_touch_assets.
           'enable_metro%': 0,
+          
+          # Is this change part of the android upstream bringup?
+          # Allows us to *temporarily* disable certain things for
+          # staging.  Only set to 1 in a GYP_DEFINES.
+          'android_upstream_bringup%': 0,
         },
         # Copy conditionally-set variables out one scope.
         'chromeos%': '<(chromeos)',
@@ -58,6 +63,7 @@
         'enable_hidpi%': '<(enable_hidpi)',
         'enable_touch_ui%': '<(enable_touch_ui)',
         'enable_metro%': '<(enable_metro)',
+        'android_upstream_bringup%': '<(android_upstream_bringup)',
 
         # Compute the architecture that we're building on.
         'conditions': [
@@ -2387,6 +2393,9 @@
               '-lm',
             ],
             'conditions': [
+              ['android_upstream_bringup==1', {
+                'defines': ['ANDROID_UPSTREAM_BRINGUP=1',],
+              }],
               ['android_build_type==0', {
                 'ldflags': [
                   '--sysroot=<(android_ndk_sysroot)',
diff --git a/java.gypi b/java.gypi
index bb60a8f10..c05981d67 100644
--- a/java.gypi
+++ b/java.gypi
@@ -25,7 +25,7 @@
 # base/android/java/org/chromium/base/Bar.java
 #
 # Finally, the generated jar-file will be:
-#   <(PRODUCT_DIR)/chromium_base.jar
+#   <(PRODUCT_DIR)/lib.java/chromium_base.jar
 #
 # TODO(yfriedman): The "finally" statement isn't entirely true yet, as we don't
 # auto-generate the ant file yet.
@@ -40,7 +40,7 @@
          '<!@(find <(java_in_dir) -name "*.java")'
       ],
       'outputs': [
-         '<(PRODUCT_DIR)/chromium_<(package_name).jar',
+        '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',
       ],
       'action': [
         'ant',