diff --git a/DEPS b/DEPS
index 85dfea346d..5708c39bd6 100644
--- a/DEPS
+++ b/DEPS
@@ -6,7 +6,7 @@
 vars = {
   'extra_gyp_flag': '-Dextra_gyp_flag=0',
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': '1a73d11e65f5af4fc946a00ed1a2b7022ed28c64',
+  'chromium_revision': '7fa6701bc5183bd5a73203d4fe1309f75ccfd5b4',
 }
 
 # NOTE: Use http rather than https; the latter can cause problems for users
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index da8a1d5e82..1088355ef7 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -13,9 +13,6 @@
 mac_sdk_min_build_override = "10.11"
 mac_deployment_target_build_override = "10.7"
 
-# Some non-Chromium builds don't support building java targets.
-enable_java_templates = true
-
 # Variable that can be used to support multiple build scenarios, like having
 # Chromium specific targets in a client project's GN file etc.
 build_with_chromium = false
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 4bf8c5fa19..d99b990918 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -57,7 +57,7 @@ const char* kPathDelimiter = "/";
 #endif
 
 #ifdef WEBRTC_ANDROID
-const char* kRootDirName = "/sdcard/chromium_tests_root/";
+const char* kRootDirName = "/sdcard/";
 #else
 // The file we're looking for to identify the project root dir.
 const char* kProjectRootFileName = "DEPS";