diff --git a/DEPS b/DEPS
index fa9cf1b49f..30984fe451 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@
 
 vars = {
   'chromium_git': 'https://chromium.googlesource.com',
-  'chromium_revision': '5e821a778b85878bafcc8128f64333fd518c79a5',
+  'chromium_revision': '5c22c2afacd399b830795330efff38f07f0c4bec',
 }
 
 deps = {
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index de2655819c..c7cc22b53f 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -39,3 +39,5 @@ ignore_elf32_limitations = true
 # Use system Xcode installation instead of the Chromium bundled Mac toolchain,
 # since it contains only SDK 10.11, not 10.12 which WebRTC needs.
 use_system_xcode = true
+
+android_test_runner_script = "../../webrtc/build/android/test_runner.py"
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index 7ff05d2bd9..5d19957a91 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -770,5 +770,9 @@ if (is_android) {
     deps = [
       "//base:base_java",
     ]
+
+    data = [
+      "//webrtc/build/android/test_runner.py",
+    ]
   }
 }
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
index 2adcdaebff..45d915bd59 100644
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.cc
@@ -625,7 +625,14 @@ TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossH264) {
 // VP9: Run with no packet loss and fixed bitrate. Quality should be very high.
 // One key frame (first frame only) in sequence. Setting |key_frame_interval|
 // to -1 below means no periodic key frames in test.
-TEST_F(VideoProcessorIntegrationTest, Process0PercentPacketLossVP9) {
+
+#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
+// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
+#define MAYBE_Process0PercentPacketLossVP9 DISABLED_Process0PercentPacketLossVP9
+#else
+#define MAYBE_Process0PercentPacketLossVP9 Process0PercentPacketLossVP9
+#endif
+TEST_F(VideoProcessorIntegrationTest, MAYBE_Process0PercentPacketLossVP9) {
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
   SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
@@ -671,7 +678,14 @@ TEST_F(VideoProcessorIntegrationTest, Process5PercentPacketLossVP9) {
 // low to high to medium. Check that quality and encoder response to the new
 // target rate/per-frame bandwidth (for each rate update) is within limits.
 // One key frame (first frame only) in sequence.
-TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
+#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
+// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
+#define MAYBE_ProcessNoLossChangeBitRateVP9 \
+  DISABLED_ProcessNoLossChangeBitRateVP9
+#else
+#define MAYBE_ProcessNoLossChangeBitRateVP9 ProcessNoLossChangeBitRateVP9
+#endif
+TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossChangeBitRateVP9) {
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
   SetRateProfilePars(&rate_profile, 0, 200, 30, 0);
@@ -703,8 +717,10 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossChangeBitRateVP9) {
 // Note: quality after update should be higher but we currently compute quality
 // metrics averaged over whole sequence run.
 
-#if defined(WEBRTC_ANDROID)
+#if defined(WEBRTC_ANDROID) || defined(THREAD_SANITIZER) || \
+  defined(UNDEFINED_SANITIZER)
 // Flaky on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=6057.
+// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
 #define MAYBE_ProcessNoLossChangeFrameRateFrameDropVP9 \
   DISABLED_ProcessNoLossChangeFrameRateFrameDropVP9
 #else
@@ -738,7 +754,13 @@ TEST_F(VideoProcessorIntegrationTest,
 }
 
 // VP9: Run with no packet loss and denoiser on. One key frame (first frame).
-TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
+#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
+// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
+#define MAYBE_ProcessNoLossDenoiserOnVP9 DISABLED_ProcessNoLossDenoiserOnVP9
+#else
+#define MAYBE_ProcessNoLossDenoiserOnVP9 ProcessNoLossDenoiserOnVP9
+#endif
+TEST_F(VideoProcessorIntegrationTest, MAYBE_ProcessNoLossDenoiserOnVP9) {
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
   SetRateProfilePars(&rate_profile, 0, 500, 30, 0);
@@ -761,7 +783,16 @@ TEST_F(VideoProcessorIntegrationTest, ProcessNoLossDenoiserOnVP9) {
 // Run with no packet loss, at low bitrate.
 // spatial_resize is on, for this low bitrate expect one resize in sequence.
 // Resize happens on delta frame. Expect only one key frame (first frame).
-TEST_F(VideoProcessorIntegrationTest, ProcessNoLossSpatialResizeFrameDropVP9) {
+#if defined(THREAD_SANITIZER) || defined(UNDEFINED_SANITIZER)
+// Fails on TSan and UBSan: https://bugs.webrtc.org/6781.
+#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
+  DISABLED_ProcessNoLossSpatialResizeFrameDropVP9
+#else
+#define MAYBE_ProcessNoLossSpatialResizeFrameDropVP9 \
+  ProcessNoLossSpatialResizeFrameDropVP9
+#endif
+TEST_F(VideoProcessorIntegrationTest,
+       MAYBE_ProcessNoLossSpatialResizeFrameDropVP9) {
   config_.networking_config.packet_loss_probability = 0;
   // Bitrate and frame rate profile.
   RateProfile rate_profile;
diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn
index c7c6458008..8b323bf28d 100644
--- a/webrtc/test/BUILD.gn
+++ b/webrtc/test/BUILD.gn
@@ -153,6 +153,9 @@ rtc_source_set("test_support") {
 
   if (is_android) {
     deps += [ "//base:base" ]
+    data = [
+      "../build/android/test_runner.py",
+    ]
   }
 
   if (rtc_use_memcheck) {