weblayer, skew tests: Add two separate gn argument sets to skew tests

mb_config.pyl

This Cl allows people to set the webview package name to
com.android.webview when compiling skew tests. This package name is
necessary on Android M and 10 x86 emulator builders.

Test: Compiled binaries locally using mb_config.pyl

Bug: 1163652
Change-Id: I968ab22359283caa9a5855f4b073df6ab5147b9d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2628651Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Cr-Commit-Position: refs/heads/master@{#843669}

weblayer/browser/android/javatests/skew/mb_config.pyl

@@ -12,16 +12,20 @@
 # builder to be used with mb.py for creating a zip archive of the WebLayer
 # instrumentation tests.
 {
-  'masters': {
-    'dummy.master': {
-      'dummy.builder': 'android_release_bot_minimal_symbols_x86_webview_google',
-    },
+  'builder_groups': {
+    'dummy.group': {
+      'dummy.builder.google_webview_pkg_name': 'android_weblayer_with_google_webview_pkg_name',
+      'dummy.builder.aosp_webview_pkg_name': 'android_weblayer_with_aosp_webview_pkg_name',
+    }
   },
 
   'configs': {
-    'android_release_bot_minimal_symbols_x86_webview_google': [
-      'android', 'release_bot', 'minimal_symbols', 'x86',
-      'strip_debug_info', 'webview_google', 'improved_debugging',
+    'android_weblayer_with_aosp_webview_pkg_name': [
+      'android_release_bot_minimal_symbols_x86'
+    ],
+
+    'android_weblayer_with_google_webview_pkg_name': [
+      'android_release_bot_minimal_symbols_x86_webview_google'
     ],
   },
 
@@ -36,6 +40,18 @@
       'mixins': ['android_without_codecs', 'chrome_with_codecs'],
     },
 
+    # Default webview package name is com.android.webview which
+    # is necessary for skew tests to work on Android M and Anroid 10
+    # x86 builders.
+    'android_release_bot_minimal_symbols_x86': {
+      'mixins': ['android', 'release_bot', 'minimal_symbols', 'x86',
+                 'strip_debug_info', 'improved_debugging'],
+    },
+
+    'android_release_bot_minimal_symbols_x86_webview_google': {
+      'mixins': ['android_release_bot_minimal_symbols_x86', 'webview_google'],
+    },
+
     'android_without_codecs': {
       'gn_args': 'target_os="android"',
     },