diff --git a/webrtc/build/mb_config.pyl b/webrtc/build/mb_config.pyl
index e24258cd70..c35842d119 100644
--- a/webrtc/build/mb_config.pyl
+++ b/webrtc/build/mb_config.pyl
@@ -241,10 +241,10 @@
       'gn', 'crosscompile', 'openh264_release_bot', 'arm'
     ],
     'gyp_debug_bot_x64_exclude_tests': [
-      'gyp', 'openh264_debug_bot', 'x64', 'exclude_tests', 'exclude_examples'
+      'gyp', 'gyp_limited_support_build', 'debug_bot', 'x64'
     ],
     'gyp_release_bot_x64_exclude_tests': [
-      'gyp', 'openh264_release_bot', 'x64', 'exclude_tests', 'exclude_examples'
+      'gyp', 'gyp_limited_support_build', 'release_bot', 'x64'
     ],
     'gn_asan_lsan_clang_release_bot_x64': [
       'gn', 'asan', 'lsan', 'clang', 'openh264_release_bot', 'x64'
@@ -309,12 +309,10 @@
 
     # Android
     'android_gyp_debug_static_bot_arm': [
-      'android', 'gyp', 'debug_static_bot', 'arm', 'exclude_tests',
-      'exclude_examples'
+      'android', 'gyp', 'gyp_limited_support_build', 'debug_static_bot', 'arm'
     ],
     'android_gyp_release_bot_arm': [
-      'android', 'gyp', 'release_bot', 'arm', 'exclude_tests',
-      'exclude_examples'
+      'android', 'gyp', 'gyp_limited_support_build', 'release_bot', 'arm'
     ],
     'android_gn_debug_static_bot_arm': [
       'android', 'gn', 'debug_static_bot', 'arm'
@@ -423,15 +421,6 @@
       'gyp_defines': 'target_arch=unknown',
     },
 
-    'exclude_examples': {
-      'gyp_defines': 'include_examples=0',
-    },
-
-    'exclude_tests': {
-      'gn_args': 'rtc_include_tests=false',
-      'gyp_defines': 'include_tests=0',
-    },
-
     'gn': {'type': 'gn'},
 
     'goma': {
@@ -443,6 +432,10 @@
 
     'gyp': {'type': 'gyp'},
 
+    'gyp_limited_support_build': {
+      'gyp_defines': 'include_examples=0 include_tests=0 rtc_use_h264=0'
+    },
+
     'ios': {
       'gn_args': 'target_os="ios"',
       'gyp_defines': 'OS=ios',