diff --git a/DEPS b/DEPS
index 137eb1a091..a8c66d9b02 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': '9b5bb47fa0a7e219fdaf093a83ba2a1f63f63b7e',
+  'chromium_revision': '04e7c673d985877c240d0c2791c33e9aeeace7f8',
 }
 
 # 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 ef40901e59..e5bdf06e73 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -30,3 +30,8 @@ tsan_suppressions_file = "//webrtc/build/sanitizers/tsan_suppressions_webrtc.cc"
 
 # Android lint suppressions file
 lint_suppressions_file = "//webrtc/build/android/suppressions.xml"
+
+# For Chromium, Android 32-bit non-component, non-clang builds hit a 4GiB size
+# limit, making them requiring symbol_level=2. WebRTC doesn't hit that problem
+# so we just ignore that assert. See https://crbug.com/648948 for more info.
+ignore_elf32_limitations = true
diff --git a/setup_links.py b/setup_links.py
index 7ab086eefe..30b7a9ab27 100755
--- a/setup_links.py
+++ b/setup_links.py
@@ -90,6 +90,7 @@ if 'android' in target_os:
     'base',
     'third_party/accessibility_test_framework',
     'third_party/android_platform',
+    'third_party/android_support_test_runner',
     'third_party/android_tools',
     'third_party/apache_velocity',
     'third_party/appurify-python',
diff --git a/webrtc/test/ios/Info.plist b/webrtc/test/ios/Info.plist
index 3adbe7cff6..4f6ae58754 100644
--- a/webrtc/test/ios/Info.plist
+++ b/webrtc/test/ios/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.gtest.${BUNDLE_ID_TEST_NAME:rfc1034identifier}</string>
+	<string>${IOS_BUNDLE_ID_PREFIX}.gtest.${GTEST_BUNDLE_ID_SUFFIX:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>