Merge mozilla-central to autoland. a=merge CLOSED TREE
authorshindli <shindli@mozilla.com>
Mon, 22 Apr 2019 12:47:02 +0300
changeset 470341 355f26707b354faec37e740b99950e70ab3221fc
parent 470340 e7dc7b90caadb4e441a0b6d506f782c15f221b10 (diff)
parent 470331 b783cd5203ea589bb7505852e5108ed142d2d37a (current diff)
child 470342 61587f94c1729e446879c995386ba60fc31f39ba
push id112865
push usershindli@mozilla.com
push dateMon, 22 Apr 2019 15:52:44 +0000
treeherdermozilla-inbound@b4b482a09cf0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. a=merge CLOSED TREE
--- a/browser/components/extensions/test/browser/browser_ext_sessions_restoreTab.js
+++ b/browser/components/extensions/test/browser/browser_ext_sessions_restoreTab.js
@@ -56,8 +56,61 @@ add_task(async function test_restoringMo
   is(restoredTab.linkedBrowser.currentURI.spec, contentScriptTabURL, "Got expected URL");
 
   await extension.unload();
   BrowserTestUtils.removeTab(restoredTab);
 
   // Close the window.
   await BrowserTestUtils.closeWindow(win);
 });
+
+add_task(async function test_restoringClosedTabWithTooLargeIndex() {
+  function background() {
+    browser.test.onMessage.addListener(async (msg, filter) => {
+      if (msg != "restoreTab") {
+        return;
+      }
+      const recentlyClosed = await browser.sessions.getRecentlyClosed({maxResults: 2});
+      let tabWithTooLargeIndex;
+      for (const info of recentlyClosed) {
+        if (info.tab && info.tab.index > 1) {
+          tabWithTooLargeIndex = info.tab;
+          break;
+        }
+      }
+      const onRestored = tab => {
+        browser.tabs.onCreated.removeListener(onRestored);
+        browser.test.sendMessage("restoredTab", tab);
+      };
+      browser.tabs.onCreated.addListener(onRestored);
+      browser.sessions.restore(tabWithTooLargeIndex.sessionId);
+    });
+  }
+  let extension = ExtensionTestUtils.loadExtension({
+    manifest: {
+      permissions: ["tabs", "sessions"],
+    },
+    background,
+  });
+
+  const win = await BrowserTestUtils.openNewBrowserWindow({});
+  const tabs = await Promise.all([
+    BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:blank?0"),
+    BrowserTestUtils.openNewForegroundTab(win.gBrowser, "about:blank?1"),
+  ]);
+  const promsiedSessionStored = Promise.all([
+    BrowserTestUtils.waitForSessionStoreUpdate(tabs[0]),
+    BrowserTestUtils.waitForSessionStoreUpdate(tabs[1]),
+  ]);
+  // Close the rightmost tab at first
+  BrowserTestUtils.removeTab(tabs[1]);
+  BrowserTestUtils.removeTab(tabs[0]);
+  await promsiedSessionStored;
+
+  await extension.startup();
+  const promisedRestoredTab = extension.awaitMessage("restoredTab");
+  extension.sendMessage("restoreTab");
+  const restoredTab = await promisedRestoredTab;
+  is(restoredTab.index, 1, "Got valid index");
+
+  await extension.unload();
+  await BrowserTestUtils.closeWindow(win);
+});
--- a/browser/components/extensions/test/browser/browser_ext_tabs_create.js
+++ b/browser/components/extensions/test/browser/browser_ext_tabs_create.js
@@ -94,16 +94,20 @@ add_task(async function test_create_opti
             {
               create: {index: 1, active: false},
               result: {index: 1, active: false},
             },
             {
               create: {windowId: activeWindow},
               result: {windowId: activeWindow},
             },
+            {
+              create: {index: 9999},
+              result: {index: 2},
+            },
           ];
 
           async function nextTest() {
             if (!tests.length) {
               browser.test.notifyPass("tabs.create");
               return;
             }
 
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -407,16 +407,18 @@ android-opt-tests:
     - robocop
 
 android-x86_64-opt-tests:
     # crashtests failing on debug; bug 1524493
     - crashtest
     # geckoview-junit perma-fail on opt and debug; bug 1521195
     # - geckoview-junit
     - mochitest
+    - web-platform-tests
+    - web-platform-tests-reftests
 
 android-x86_64-tests:
     - gtest
     - jsreftest
     - marionette
     - mochitest-clipboard
     - mochitest-gpu
     # various reftest (plain) failures; bug 1501582
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -18,24 +18,28 @@ job-defaults:
                 macosx.*:
                     - web_platform_tests/prod_config_mac.py
                 android-em.*:
                     - android/androidx86_7_0.py
                     - web_platform_tests/prod_config_android.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
+    target:
+        by-test-platform:
+            android-em-7.0-x86_64/opt: geckoview-androidTest.apk
+            default: null
 
 web-platform-tests:
     description: "Web platform test run"
     suite: web-platform-tests
     treeherder-symbol: W(wpt)
     chunks:
         by-test-platform:
-            android.*: 36
+            android.*: 18
             linux.*/debug: 18
             macosx64.*/opt: 8
             macosx64/debug: 16
             windows10.*/debug: 18
             windows10-aarch64/opt: 12
             macosx64-ccov/debug: 24
             default: 12
     max-run-time:
@@ -50,16 +54,17 @@ web-platform-tests:
     run-on-projects:
         by-test-platform:
             android.*: ['mozilla-central', 'try']
             windows10-aarch64/opt: ['try', 'mozilla-central']
             .*-qr/.*: ['release', 'try']  # skip on integration branches due to high load
             default: built-projects
     tier:
         by-test-platform:
+            android-em-7.0-x86_64/opt: 3
             android.*: 2
             linux64-asan/opt: 2
             windows10-aarch64.*: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
             default: default
     mozharness:
         chunked: true
         extra-options:
@@ -91,31 +96,29 @@ web-platform-tests-headless:
                 default:
                     - --test-type=testharness
                     - --headless
 
 web-platform-tests-reftests:
     description: "Web platform reftest run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(Wr)
-    chunks:
-        by-test-platform:
-            android.*: 12
-            default: 6
+    chunks: 6
     e10s:
         by-test-platform:
             linux32/debug: both
             default: true
     run-on-projects:
         by-test-platform:
             android.*: ['mozilla-central', 'try']
             windows10-aarch64/opt: ['try', 'mozilla-central']
             default: built-projects
     tier:
         by-test-platform:
+            android-em-7.0-x86_64/opt: 3
             android.*: 2
             linux64-asan/opt: 2
             windows10-aarch64.*: 2
             default: default
     mozharness:
         extra-options:
             - --test-type=reftest
 
--- a/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
+++ b/testing/raptor/raptor/playback/mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
@@ -1,10 +1,10 @@
 [
   {
-    "size": 6730120,
+    "size": 971729,
     "visibility": "public",
-    "digest": "c336c070497506cd13bfefd1c2fc8324c5a2f60e9088fc593a71bfd8f0d59743fcc8bd3dbb2df7ac219cd99b6b335c4cfc920404bc438d4470c264f360b5474d",
+    "digest": "75d4bdb1315de4aafe0412ece7cb8dc6766587a5aa8e1567b136d603d0dc41ad5bf9ced5a699a5f7e5149af66065fcf501c22cc60a84d8fedcdb0303b7147e73",
     "algorithm": "sha512",
     "filename": "google-search-restaurants-mobile.zip",
     "unpack": true
   }
 ]
--- a/testing/raptor/raptor/tests/raptor-tp6m-3.ini
+++ b/testing/raptor/raptor/tests/raptor-tp6m-3.ini
@@ -21,36 +21,38 @@ test_url = https://www.google.com/maps?f
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
 [raptor-tp6m-google-restaurants-geckoview]
 apps = geckoview
 test_url = https://www.google.com/search?q=restaurants+near+me
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
 playback_recordings = google-search-restaurants-mobile.mp
+playback_version = 4.0.4
 measure = fnbpaint, fcp, dcf, loadtime
-disabled = Bug 1533283 Intermittent timeouts running raptor-tp6m-google-restaurants-geckoview
 
 [raptor-tp6m-google-maps-fennec]
 apps = fennec
 test_url = https://www.google.com/maps?force=pwa
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
 
 [raptor-tp6m-google-restaurants-fennec]
 apps = fennec
 test_url = https://www.google.com/search?q=restaurants+near+me
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-restaurants.manifest
 playback_recordings = google-search-restaurants-mobile.mp
+playback_binary_manifest = mitmproxy-rel-bin-4.0.4-{platform}.manifest
+playback_version = 4.0.4
 measure = fnbpaint, dcf, loadtime
 alert_on = loadtime
-disabled = Bug 1541431 TEST-UNEXPECTED-FAIL: test 'raptor-tp6m-google-restaurants-fennec' timed out loading test page
 
 [raptor-tp6m-google-maps-refbrow]
 apps = refbrow
 test_url = https://www.google.com/maps?force=pwa
 playback_pageset_manifest = mitmproxy-recordings-raptor-tp6m-google-maps.manifest
 playback_recordings = google_maps_mobile.mp
 measure = fnbpaint, fcp, dcf, loadtime
 
--- a/testing/web-platform/meta/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
+++ b/testing/web-platform/meta/2dcontext/drawing-text-to-the-canvas/2d.text.draw.fontface.notinpage.html.ini
@@ -1,9 +1,9 @@
 [2d.text.draw.fontface.notinpage.html]
   disabled:
     if verify: fails in verify mode
     if debug: true
   [@font-face fonts should work even if they are not used in the page]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.arc.html.ini
@@ -1,8 +1,8 @@
 [2d.path.stroke.prune.arc.html]
   [Zero-length line segments from arcTo and arc are removed before stroking]
     expected:
       if (os == "linux"): FAIL
       if (os == "win"): FAIL
       if (os == "mac"): FAIL
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.closed.html.ini
@@ -1,8 +1,8 @@
 [2d.path.stroke.prune.closed.html]
   [Zero-length line segments from closed paths are removed before stroking]
     expected:
       if (os == "win"): FAIL
       if (os == "mac"): FAIL
       if (os == "linux"): FAIL
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.curve.html.ini
@@ -1,8 +1,8 @@
 [2d.path.stroke.prune.curve.html]
   [Zero-length line segments from quadraticCurveTo and bezierCurveTo are removed before stroking]
     expected:
       if (os == "linux"): FAIL
       if (os == "win"): FAIL
       if (os == "mac"): FAIL
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.line.html.ini
@@ -1,8 +1,8 @@
 [2d.path.stroke.prune.line.html]
   [Zero-length line segments from lineTo are removed before stroking]
     expected:
       if (os == "linux"): FAIL
       if (os == "win"): FAIL
       if (os == "mac"): FAIL
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.rect.html.ini
+++ b/testing/web-platform/meta/2dcontext/path-objects/2d.path.stroke.prune.rect.html.ini
@@ -1,8 +1,8 @@
 [2d.path.stroke.prune.rect.html]
   [Zero-length line segments from rect and strokeRect are removed before stroking]
     expected:
       if (os == "win"): FAIL
       if (os == "mac"): FAIL
       if (os == "linux"): FAIL
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/acid/acid2/reftest.html.ini
+++ b/testing/web-platform/meta/acid/acid2/reftest.html.ini
@@ -1,7 +1,7 @@
 [reftest.html]
   expected:
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
--- a/testing/web-platform/meta/compat/idlharness.window.js.ini
+++ b/testing/web-platform/meta/compat/idlharness.window.js.ini
@@ -1,26 +1,26 @@
 [idlharness.window.html]
   [HTMLBodyElement interface: document.body must inherit property "onorientationchange" with the proper type]
     expected: FAIL
 
   [Window interface: attribute orientation]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Window interface: window must inherit property "orientation" with the proper type]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [HTMLBodyElement interface: attribute onorientationchange]
     expected: FAIL
 
   [Window interface: window must inherit property "onorientationchange" with the proper type]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Window interface: attribute onorientationchange]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
--- a/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini
+++ b/testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini
@@ -1,4 +1,4 @@
 [webkit-text-fill-color-property-002.html]
   prefs: [layout.css.prefixes.webkit:true]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/content-security-policy/img-src/icon-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/img-src/icon-blocked.sub.html.ini
@@ -1,7 +1,7 @@
 [icon-blocked.sub.html]
   expected:
-    if (os == "android"): TIMEOUT
+    if os == "android" and not e10s: TIMEOUT
   [Test that spv event is fired]
     expected:
-      if (os == "android"): NOTRUN
+      if os == "android" and not e10s: NOTRUN
 
--- a/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.ini
@@ -1,11 +1,11 @@
 [child-navigates-parent-blocked.sub.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
   [Violation report status OK.]
     expected: FAIL
 
   [Test that the child can't navigate the parent because the relevant policy belongs to the navigation initiator (in this case the child)]
     expected: FAIL
 
   [Test that the child can't navigate the parent because the relevant policy belongs to the navigation initiator (in this case the child which has the policy `navigate-to 'none'`)]
     expected: FAIL
--- a/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain-because-of-same-origin.sub.html.ini
@@ -1,4 +1,4 @@
 [allowed-end-of-chain-because-of-same-origin.sub.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
 
--- a/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/allowed-end-of-chain.sub.html.ini
@@ -1,4 +1,4 @@
 [allowed-end-of-chain.sub.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
 
--- a/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html.ini
+++ b/testing/web-platform/meta/content-security-policy/navigate-to/unsafe-allow-redirects/blocked-end-of-chain.sub.html.ini
@@ -1,6 +1,6 @@
 [blocked-end-of-chain.sub.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1511193
   [Test that the child iframe navigation is blocked]
     expected: FAIL
 
--- a/testing/web-platform/meta/cookies/samesite/form-post-blank-reload.html.ini
+++ b/testing/web-platform/meta/cookies/samesite/form-post-blank-reload.html.ini
@@ -1,24 +1,24 @@
 [form-post-blank-reload.html]
   expected:
-    if (os == "android"): TIMEOUT
+    if os == "android" and not e10s: TIMEOUT
     ERROR
   [Untitled]
     expected:
-      if (os == "android"): NOTRUN
+      if os == "android" and not e10s: NOTRUN
       FAIL
 
   [Reloaded same-host top-level form POSTs are strictly same-site]
     expected:
-      if (os == "android"): TIMEOUT
+      if os == "android" and not e10s: TIMEOUT
       if debug and not e10s and (os == "linux"): TIMEOUT
 
   [Reloaded subdomain top-level form POSTs are strictly same-site]
     expected:
-      if (os == "android"): NOTRUN
+      if os == "android" and not e10s: NOTRUN
       if debug and not e10s and (os == "linux"): NOTRUN
 
   [Reloaded cross-site top-level form POSTs are not same-site]
     expected:
-      if (os == "android"): NOTRUN
+      if os == "android" and not e10s: NOTRUN
       if debug and not e10s and (os == "linux"): NOTRUN
 
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-initial-009a.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-initial-009b.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-initial-009e.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-initial-009f.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini
@@ -1,3 +1,3 @@
 [background-003.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-001.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-002.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-003.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-003.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-004.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-004.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-005.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-005.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-006.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-006.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-007.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-007.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-009.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-009.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-012.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-012.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-013.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-013.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-014.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-014.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-attachment-applies-to-015.xht.ini
@@ -1,3 +1,3 @@
 [background-attachment-applies-to-015.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-bg-pos-206.xht.ini
@@ -1,6 +1,6 @@
 [background-bg-pos-206.xht]
   expected:
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-image-cover-attachment-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-image-cover-attachment-001.xht.ini
@@ -1,3 +1,3 @@
 [background-image-cover-attachment-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-root-018.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-root-018.xht.ini
@@ -1,3 +1,3 @@
 [background-root-018.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-004.xht.ini
@@ -1,6 +1,6 @@
 [bidi-004.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "linux"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini
@@ -1,3 +1,3 @@
 [bidi-breaking-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini
@@ -1,3 +1,3 @@
 [bidi-breaking-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini
@@ -1,5 +1,5 @@
 [block-in-inline-001.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini
@@ -1,5 +1,5 @@
 [block-in-inline-002.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/box-generation-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/box-generation-001.xht.ini
@@ -1,5 +1,5 @@
 [box-generation-001.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/box-generation-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/box-generation-002.xht.ini
@@ -1,5 +1,5 @@
 [box-generation-002.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/containing-block-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/containing-block-010.xht.ini
@@ -1,3 +1,3 @@
 [containing-block-010.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/display-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/display-008.xht.ini
@@ -1,5 +1,5 @@
 [display-008.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/display-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/display-009.xht.ini
@@ -1,5 +1,5 @@
 [display-009.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/display-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/display-012.xht.ini
@@ -1,5 +1,5 @@
 [display-012.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/box-display/display-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/box-display/display-013.xht.ini
@@ -1,5 +1,5 @@
 [display-013.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-ibx-000.xht.ini
@@ -1,4 +1,4 @@
 [c43-rpl-ibx-000.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
@@ -1,3 +1,3 @@
 [c548-ln-ht-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
@@ -1,3 +1,3 @@
 [c548-ln-ht-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-003.xht.ini
@@ -1,5 +1,5 @@
 [c5502-imrgn-r-003.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-005.xht.ini
@@ -1,4 +1,4 @@
 [c5502-imrgn-r-005.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-006.xht.ini
@@ -1,4 +1,4 @@
 [c5502-imrgn-r-006.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
@@ -1,3 +1,3 @@
 [c5504-imrgn-l-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-003.xht.ini
@@ -1,5 +1,5 @@
 [c5504-imrgn-l-003.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-005.xht.ini
@@ -1,4 +1,4 @@
 [c5504-imrgn-l-005.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-006.xht.ini
@@ -1,4 +1,4 @@
 [c5504-imrgn-l-006.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5505-imrgn-000.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5505-imrgn-000.xht.ini
@@ -1,4 +1,4 @@
 [c5505-imrgn-000.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-004.xht.ini
@@ -1,4 +1,4 @@
 [c5507-ipadn-r-004.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
@@ -1,3 +1,3 @@
 [c5509-ipadn-l-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-003.xht.ini
@@ -1,5 +1,5 @@
 [c5509-ipadn-l-003.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-004.xht.ini
@@ -1,4 +1,4 @@
 [c5509-ipadn-l-004.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5510-ipadn-000.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5510-ipadn-000.xht.ini
@@ -1,4 +1,4 @@
 [c5510-ipadn-000.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5512-brdr-rw-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5512-brdr-rw-001.xht.ini
@@ -1,3 +1,3 @@
 [c5512-brdr-rw-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css1/c5514-brdr-lw-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/css1/c5514-brdr-lw-001.xht.ini
@@ -1,3 +1,3 @@
 [c5514-brdr-lw-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css21-errata/s-11-1-1b-005.html.ini
+++ b/testing/web-platform/meta/css/CSS2/css21-errata/s-11-1-1b-005.html.ini
@@ -1,3 +1,3 @@
 [s-11-1-1b-005.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/css21-errata/s-11-1-1b-006.html.ini
+++ b/testing/web-platform/meta/css/CSS2/css21-errata/s-11-1-1b-006.html.ini
@@ -1,3 +1,3 @@
 [s-11-1-1b-006.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-replaced-height-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-replaced-height-002.xht.ini
@@ -1,3 +1,3 @@
 [float-replaced-height-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-001.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-002.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-005.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-006.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-007.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-008.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-009.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-010.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-011.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-014.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-015.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
@@ -1,4 +1,4 @@
 [font-family-applies-to-017.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-matching-rule-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-matching-rule-009.xht.ini
@@ -1,3 +1,3 @@
 [font-matching-rule-009.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
@@ -1,4 +1,4 @@
 [font-size-122.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini
@@ -1,5 +1,5 @@
 [content-177.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-002.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-003.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-004.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-005.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-006.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini
@@ -1,5 +1,5 @@
 [inline-formatting-context-007.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
@@ -1,3 +1,3 @@
 [inline-formatting-context-013.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini
@@ -1,5 +1,5 @@
 [vertical-align-sub-001.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini
@@ -1,5 +1,5 @@
 [vertical-align-super-001.xht]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini
@@ -1,3 +1,3 @@
 [margin-collapse-020.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini
@@ -1,3 +1,3 @@
 [margin-collapse-021.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-percentage-inherit-001.xht.ini
@@ -1,4 +1,4 @@
 [margin-percentage-inherit-001.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini
@@ -1,9 +1,9 @@
 [margin-right-104.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-em-inherit-001.xht.ini
@@ -1,4 +1,4 @@
 [padding-em-inherit-001.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-height-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-height-002.xht.ini
@@ -1,3 +1,3 @@
 [block-replaced-height-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini
@@ -1,7 +1,7 @@
 [blocks-021.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini
@@ -1,11 +1,11 @@
 [blocks-022.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini
@@ -1,3 +1,3 @@
 [blocks-025.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini
@@ -1,3 +1,3 @@
 [blocks-026.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-height-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-height-002.xht.ini
@@ -1,3 +1,3 @@
 [inline-block-replaced-height-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini
@@ -1,4 +1,4 @@
 [inline-block-replaced-width-008.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-height-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-height-002.xht.ini
@@ -1,3 +1,3 @@
 [inline-replaced-height-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
@@ -1,3 +1,3 @@
 [inlines-017.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-height-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-height-001.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-height-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-height-002.xht.ini
@@ -1,3 +1,3 @@
 [absolute-replaced-height-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/abspos-containing-block-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/abspos-containing-block-001.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/abspos-containing-block-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/abspos-containing-block-003.xht.ini
@@ -1,3 +1,3 @@
 [abspos-containing-block-003.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/abspos-float-with-inline-container.html.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/abspos-float-with-inline-container.html.ini
@@ -1,5 +1,5 @@
 [abspos-float-with-inline-container.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "win"): FAIL
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/positioning/position-relative-035.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/positioning/position-relative-035.xht.ini
@@ -1,5 +1,5 @@
 [position-relative-035.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-005.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-005.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-010.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-010.xht]
   expected:
     if (os == "win"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-012.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-012.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-013.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-013.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-014.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-014.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-015.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-015.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-016.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-016.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-016.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-017.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-017.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-018.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-018.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-018.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-019.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-019.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-019.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-024.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-024.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-024.xht]
   expected:
     if (os == "win"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-037.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-037.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-037.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-038.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-038.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-038.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-039.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-039.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-039.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-040.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-040.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-040.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-041.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-041.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-041.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-042.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-042.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-042.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-043.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-043.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-043.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-044.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-044.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-044.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-047.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-047.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-047.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-048.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-048.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-048.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-062.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-062.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-062.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-063.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-063.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-063.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-064.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-064.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-064.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-065.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-065.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-065.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-066.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-066.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-066.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-068.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-068.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-068.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-069.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-069.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-069.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-077.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-077.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-077.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-078.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-078.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-078.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-079.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-079.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-079.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-088.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-088.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-088.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-092.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-092.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-092.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-107.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-107.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-107.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-108.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-108.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-108.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-109.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-109.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-109.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-110.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-110.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-110.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-111.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-111.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-111.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-112.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-112.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-112.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-113.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-113.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-113.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-120.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-120.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-120.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-125.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-125.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-125.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-126.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-126.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-126.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-127.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-127.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-127.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-147.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-147.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-147.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-175.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-175.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-175.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-176.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-176.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-176.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-177.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-177.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-177.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-178.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-178.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-178.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-179.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-179.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-179.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-180.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-180.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-180.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-181.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-181.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-181.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-182.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-182.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-182.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-183.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-183.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-183.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-185.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-185.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-185.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-189.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-189.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-189.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-190.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-190.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-190.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-197.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-197.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-197.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-198.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-198.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-198.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-199.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-199.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-199.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-200.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-200.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-200.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-201.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-201.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-201.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-202.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-202.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-202.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-203.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-203.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-203.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-204.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-204.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-204.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-205.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-205.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-205.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-206.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-206.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-206.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-207.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-207.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-207.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-208.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-208.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-208.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-211.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-211.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-211.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-212.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-212.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-212.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-225.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-225.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-225.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-226.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-226.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-226.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-262.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-262.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-262.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-263.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-263.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-263.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-264.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-264.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-264.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-265.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-265.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-265.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-266.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-266.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-266.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-267.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-267.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-267.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-283.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-283.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-283.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-284.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-284.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-284.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-285.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-285.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-285.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-286.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-286.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-286.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-287.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-287.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-287.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-297.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-297.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-297.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-298.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-298.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-298.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-316.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-316.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-316.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-317.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-317.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-317.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-318.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-318.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-318.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-319.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-319.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-319.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-320.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-320.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-320.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-321.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-321.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-321.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-322.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-322.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-322.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-323.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-323.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-323.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-324.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-324.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-324.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-325.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-325.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-325.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-326.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-326.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-326.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-327.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-327.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-327.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-328.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-328.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-328.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-329.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-329.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-329.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-330.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-330.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-330.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-331.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-331.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-331.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-332.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-332.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-332.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-333.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-333.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-333.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-350.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-350.xht.ini
@@ -1,3 +1,3 @@
 [first-letter-punctuation-350.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-357.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-357.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-357.xht]
   expected:
     if (os == "win"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-359.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-359.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-359.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-360.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-360.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-360.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-361.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-361.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-361.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-362.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-362.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-362.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-363.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-363.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-363.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-364.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-364.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-364.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-365.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-365.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-365.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-366.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-366.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-366.xht]
   expected:
     if (os == "win") and (version == "10.0.17134"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-371.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-371.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-371.xht]
   expected:
     if (os == "win"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-384.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-384.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-384.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-385.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-385.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-385.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-386.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-386.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-386.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-387.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-387.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-387.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-388.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-388.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-388.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-389.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-389.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-389.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-390.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-390.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-390.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-391.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-391.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-391.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-393.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-393.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-393.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-394.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-394.xht.ini
@@ -1,4 +1,4 @@
 [first-letter-punctuation-394.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-408.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-408.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-408.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-409.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-409.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-409.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-410.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-410.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-410.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-411.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-411.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-411.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-412.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-letter-punctuation-412.xht.ini
@@ -1,5 +1,5 @@
 [first-letter-punctuation-412.xht]
   expected:
     if (os == "win"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
--- a/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini
+++ b/testing/web-platform/meta/css/CSS2/stacking-context/opacity-change-twice-stacking-context.html.ini
@@ -1,7 +1,7 @@
 [opacity-change-twice-stacking-context.html]
   disabled:
     if webrender and (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1526468
   expected:
     if os == "mac": FAIL
     if webrender and (os == "win"): FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/syntax/at-charset-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/syntax/at-charset-012.xht.ini
@@ -1,4 +1,4 @@
 [at-charset-012.xht]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/CSS2/syntax/escapes-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/syntax/escapes-001.xht.ini
@@ -1,3 +1,3 @@
 [escapes-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a01.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a01.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a02.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a02.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a03.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a03.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a04.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a04.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a05.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a05.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003a06.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003a06.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b01.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b01.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b02.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b02.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b03.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003b03.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b04.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003b04.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b05.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b05.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b06.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b06.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b07.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b07.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b07.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b08.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b08.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b08.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b09.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b09.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b09.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b10.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b10.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b10.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b11.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b11.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b11.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b12.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003b12.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003b12.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c01.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c01.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c02.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c02.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c03.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c03.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c04.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c04.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c05.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c05.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c06.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c06.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c07.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c07.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c07.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c08.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003c08.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003c08.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d01.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d01.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d02.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d02.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d03.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d03.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d04.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d04.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d05.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d05.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003d06.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003d06.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e01.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e01.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e02.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e02.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e03.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003e03.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e04.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003e04.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e05.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e05.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e06.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e06.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e07.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e07.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e07.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e08.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e08.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e08.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e09.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e09.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e09.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e10.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e10.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e10.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e11.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e11.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e11.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e12.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003e12.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003e12.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f01.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f01.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f01.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f02.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f02.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f02.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f03.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f03.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003f03.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f04.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f04.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-003f04.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f05.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f05.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f05.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f06.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f06.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f06.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f07.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f07.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f07.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f08.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-003f08.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-003f08.xht]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-017.xht.ini
@@ -1,4 +1,4 @@
 [fixed-table-layout-017.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-018.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-018.xht.ini
@@ -1,4 +1,4 @@
 [fixed-table-layout-018.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-019.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-019.xht.ini
@@ -1,4 +1,4 @@
 [fixed-table-layout-019.xht]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-020.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-020.xht.ini
@@ -1,3 +1,3 @@
 [fixed-table-layout-020.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-021.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-021.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-022.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-022.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-022.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-023.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/fixed-table-layout-023.xht.ini
@@ -1,5 +1,5 @@
 [fixed-table-layout-023.xht]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-008.xht.ini
@@ -1,8 +1,8 @@
 [separated-border-model-008.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/separated-border-model-009.xht.ini
@@ -1,13 +1,13 @@
 [separated-border-model-009.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-060.xht.ini
@@ -1,8 +1,8 @@
 [table-anonymous-objects-060.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-061.xht.ini
@@ -1,13 +1,13 @@
 [table-anonymous-objects-061.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-062.xht.ini
@@ -1,13 +1,13 @@
 [table-anonymous-objects-062.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-063.xht.ini
@@ -1,13 +1,13 @@
 [table-anonymous-objects-063.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-064.xht.ini
@@ -1,13 +1,13 @@
 [table-anonymous-objects-064.xht]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-065.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-065.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-066.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-066.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-067.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-067.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-068.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-068.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-069.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-069.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-070.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-070.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-071.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-071.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-072.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-072.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-073.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-073.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-074.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-074.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-075.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-075.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-076.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-076.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-077.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-077.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-078.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-078.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-087.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-087.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-088.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-088.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-089.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-089.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-090.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-090.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-091.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-091.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-092.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-092.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-099.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-099.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-100.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-100.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-101.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-101.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-102.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-102.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-103.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-103.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-104.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-104.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-105.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-105.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-106.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-106.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-107.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-107.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-108.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-108.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-109.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-109.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-110.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-110.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-111.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-111.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-112.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-112.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-113.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-113.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-114.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-114.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-123.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-123.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-124.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-124.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-125.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-125.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-126.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-126.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-127.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-127.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-128.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-128.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-129.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-129.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-130.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-130.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-131.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-131.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-132.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-132.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-133.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-133.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-134.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-134.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-135.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-135.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-136.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-136.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-137.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-137.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-138.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-138.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-139.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-139.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-140.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-140.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-141.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-141.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-142.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-142.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-143.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-143.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-144.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-144.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-145.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-145.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-146.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-146.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-147.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-147.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-148.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-148.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-149.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-149.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-150.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-150.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-151.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-151.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-152.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-152.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-153.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-153.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-154.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-154.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-157.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-157.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-158.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-158.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-159.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-159.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-160.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-160.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-161.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-161.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-162.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-162.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-163.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-163.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-164.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-164.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-165.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-165.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/tables/table-anonymous-objects-166.xht.ini
@@ -1,11 +1,11 @@
 [table-anonymous-objects-166.xht]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/CSS2/text/white-space-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-001.xht.ini
@@ -1,3 +1,3 @@
 [white-space-001.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-002.xht.ini
@@ -1,3 +1,3 @@
 [white-space-002.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-005.xht.ini
@@ -1,3 +1,3 @@
 [white-space-005.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-006.xht.ini
@@ -1,3 +1,3 @@
 [white-space-006.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-001.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-001.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-002.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-002.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-005.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-005.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-006.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-006.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-007.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-007.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-008.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-008.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-009.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-009.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-010.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-010.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-011.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-011.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-012.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-012.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-013.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-013.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-014.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-014.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-applies-to-015.xht.ini
@@ -1,3 +1,3 @@
 [white-space-applies-to-015.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
@@ -1,3 +1,3 @@
 [white-space-mixed-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-001.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-001.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-002.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-002.xht]
   expected:
     if (os == "win"): FAIL
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-003.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-003.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-003.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-004.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-004.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-004.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-008.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-008.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-009.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-009.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-010.xht.ini
@@ -1,4 +1,4 @@
 [white-space-processing-010.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-011.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-011.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-012.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-012.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-019.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-019.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-019.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-020.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-020.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-020.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-021.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-021.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-022.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-022.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-022.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-023.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-023.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-023.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-024.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-024.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-024.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-025.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-025.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-025.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-026.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-026.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-026.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-027.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-027.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-027.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-028.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-028.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-028.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-029.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-029.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-029.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-030.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-030.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-030.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-031.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-031.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-031.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-032.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-032.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-032.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-033.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-033.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-033.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-034.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-034.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-034.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-035.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-035.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-035.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-036.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-036.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-036.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-037.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-037.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-037.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-038.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-038.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-038.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-039.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-039.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-039.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-041.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-041.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-041.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-042.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-042.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-042.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-050.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-050.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-050.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-051.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-051.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-051.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-054.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-054.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-054.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-055.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-055.xht.ini
@@ -1,3 +1,3 @@
 [white-space-processing-055.xht]
   expected:
-    if (os == "android"): "FAIL"
+    if os == "android" and not e10s: "FAIL"
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-007.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-009.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-010.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
@@ -1,3 +1,3 @@
 [numbers-units-012.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
@@ -1,4 +1,4 @@
 [numbers-units-021.xht]
   expected:
     if os == "win": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/WOFF2/tabledata-recontruct-loca-001.xht.ini
+++ b/testing/web-platform/meta/css/WOFF2/tabledata-recontruct-loca-001.xht.ini
@@ -1,4 +1,4 @@
 [tabledata-recontruct-loca-001.xht]
   expected:
     if (os == "win"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-interposed.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-blended-element-interposed.html]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html.ini
@@ -1,7 +1,7 @@
 [mix-blend-mode-blended-element-overflow-hidden-and-border-radius.html]
   expected:
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-blended-with-transform-and-perspective.html.ini
@@ -1,7 +1,7 @@
 [mix-blend-mode-blended-with-transform-and-perspective.html]
   expected:
     if webrender: PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     if (os == "win") and (processor == "aarch64"): PASS
     FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
@@ -1,3 +1,3 @@
 [mix-blend-mode-both-parent-and-blended-with-3D-transform.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-canvas-parent.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-canvas-parent.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-canvas-sibling.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-canvas-sibling.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-iframe-parent.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-iframe-parent.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-iframe-sibling.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-iframe-sibling.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html.ini
@@ -1,8 +1,8 @@
 [mix-blend-mode-intermediate-element-overflow-hidden-and-border-radius.html]
   expected:
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
     if webrender: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph-background-image.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-paragraph-background-image.html]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-paragraph.html]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-element-overflow-scroll.html.ini
@@ -1,7 +1,7 @@
 [mix-blend-mode-parent-element-overflow-scroll.html]
   disabled:
     if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499779
-    if (os == "android"): android
+    if os == "android" and not e10s: android
   expected:
     if e10s and (os == "linux") and (processor == "x86"): FAIL
     if not webrender and e10s and (os == "linux") and (processor == "x86_64"): FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-border-radius.html.ini
@@ -1,7 +1,7 @@
 [mix-blend-mode-parent-with-border-radius.html]
   expected:
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-text.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-parent-with-text.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-script.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-script.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-script.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-sibling-with-3D-transform.html.ini
@@ -1,3 +1,3 @@
 [mix-blend-mode-sibling-with-3D-transform.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-simple.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-simple.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-simple.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-svg.html.ini
+++ b/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-svg.html.ini
@@ -1,5 +1,5 @@
 [mix-blend-mode-svg.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini
+++ b/testing/web-platform/meta/css/css-animations/Element-getAnimations-dynamic-changes.tentative.html.ini
@@ -1,4 +1,4 @@
 [Element-getAnimations-dynamic-changes.tentative.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1499003
 
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-1.html.ini
@@ -1,6 +1,6 @@
 [attachment-local-clipping-image-1.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-2.html.ini
@@ -1,6 +1,6 @@
 [attachment-local-clipping-image-2.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-clipping-image-3.html.ini
@@ -1,6 +1,6 @@
 [attachment-local-clipping-image-3.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-attachment-local/attachment-local-positioning-3.html.ini
@@ -1,6 +1,6 @@
 [attachment-local-positioning-3.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if (os == "win") and (processor == "aarch64"): PASS
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-clip-color-repaint.html.ini
@@ -1,7 +1,7 @@
 [background-clip-color-repaint.html]
   expected:
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/background-clip-color.html.ini
@@ -1,7 +1,7 @@
 [background-clip-color.html]
   expected:
     if (os == "linux") and not webrender: FAIL
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
+++ b/testing/web-platform/meta/css/css-backgrounds/child-move-reveals-parent-background.html.ini
@@ -1,7 +1,7 @@
 [child-move-reveals-parent-background.html]
   expected:
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-color/t422-rgba-onscreen-b.xht.ini
+++ b/testing/web-platform/meta/css/css-color/t422-rgba-onscreen-b.xht.ini
@@ -1,3 +1,3 @@
 [t422-rgba-onscreen-b.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-color/t422-rgba-onscreen-multiple-boxes-c.xht.ini
+++ b/testing/web-platform/meta/css/css-color/t422-rgba-onscreen-multiple-boxes-c.xht.ini
@@ -1,3 +1,3 @@
 [t422-rgba-onscreen-multiple-boxes-c.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-color/t425-hsla-onscreen-b.xht.ini
+++ b/testing/web-platform/meta/css/css-color/t425-hsla-onscreen-b.xht.ini
@@ -1,3 +1,3 @@
 [t425-hsla-onscreen-b.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-color/t425-hsla-onscreen-multiple-boxes-c.xht.ini
+++ b/testing/web-platform/meta/css/css-color/t425-hsla-onscreen-multiple-boxes-c.xht.ini
@@ -1,3 +1,3 @@
 [t425-hsla-onscreen-multiple-boxes-c.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-display/display-contents-unusual-html-elements-none.html.ini
+++ b/testing/web-platform/meta/css/css-display/display-contents-unusual-html-elements-none.html.ini
@@ -1,3 +1,3 @@
 [display-contents-unusual-html-elements-none.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-exclusions/wrap-flow-002.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-flow-002.html.ini
@@ -1,14 +1,14 @@
 [wrap-flow-002.html]
   [Verify top of the 'lineLeft1' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify top of the 'lineLeft2' span is positioned correctly]
     expected: FAIL
 
   [Verify right of the 'lineLeft2' span is positioned correctly]
     expected: FAIL
 
--- a/testing/web-platform/meta/css/css-exclusions/wrap-flow-003.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-flow-003.html.ini
@@ -1,8 +1,8 @@
 [wrap-flow-003.html]
   [Verify top of the 'line4' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-exclusions/wrap-flow-004.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-flow-004.html.ini
@@ -1,36 +1,36 @@
 [wrap-flow-004.html]
   [Verify left of the 'line2' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line3' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the 'line3' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line4' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the 'line4' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line5' span is positioned correctly]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify top of the 'line2' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-exclusions/wrap-flow-005.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-flow-005.html.ini
@@ -1,36 +1,36 @@
 [wrap-flow-005.html]
   [Verify left of the 'line2' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line3' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the 'line3' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line4' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the 'line4' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line5' span is positioned correctly]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify top of the 'line2' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-exclusions/wrap-flow-006.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-flow-006.html.ini
@@ -1,14 +1,14 @@
 [wrap-flow-006.html]
   [Verify top of the 'line2' span is positioned correctly]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the 'line2' span is positioned correctly]
     expected: FAIL
 
   [Verify top of the 'line3' span is positioned correctly]
     expected: FAIL
 
--- a/testing/web-platform/meta/css/css-exclusions/wrap-through-001.html.ini
+++ b/testing/web-platform/meta/css/css-exclusions/wrap-through-001.html.ini
@@ -1,28 +1,28 @@
 [wrap-through-001.html]
   [Verify left of the second line on the right of the exclusion]
     expected: FAIL
 
   [Verify top of the third line on the left of the exclusion]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify left of the third line on the right of the exclusion]
     expected: FAIL
 
   [Verify top of the fourth line with no wrapping-through = none]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Verify top of the second line on the left of the exclusion]
     expected:
       if (os == "mac"): PASS
       if (os == "linux"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini
+++ b/testing/web-platform/meta/css/css-fill-stroke/paint-order-001.tentative.html.ini
@@ -1,6 +1,6 @@
 [paint-order-001.tentative.html]
   prefs: [layout.css.paint-order.enabled:true]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1520847
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1520847
   expected:
     if (os == "win"): FAIL
--- a/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/align-items-baseline-overflow-non-visible.html.ini
@@ -1,5 +1,5 @@
 [align-items-baseline-overflow-non-visible.html]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-reverse-wrap-reverse.html.ini
@@ -1,6 +1,6 @@
 [css-flexbox-column-reverse-wrap-reverse.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-reverse-wrap.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-reverse-wrap.html.ini
@@ -1,6 +1,6 @@
 [css-flexbox-column-reverse-wrap.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-wrap-reverse.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-wrap-reverse.html.ini
@@ -1,6 +1,6 @@
 [css-flexbox-column-wrap-reverse.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-wrap.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/css-flexbox-column-wrap.html.ini
@@ -1,6 +1,6 @@
 [css-flexbox-column-wrap.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): PASS
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-flexbox/flexbox_stf-table-singleline-2.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/flexbox_stf-table-singleline-2.html.ini
@@ -1,3 +1,3 @@
 [flexbox_stf-table-singleline-2.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-flexbox/flexbox_stf-table-singleline.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/flexbox_stf-table-singleline.html.ini
@@ -1,3 +1,3 @@
 [flexbox_stf-table-singleline.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-order.html.ini
@@ -1,13 +1,13 @@
 [ttwf-reftest-flex-order.html]
   expected:
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
+    if os == "android" and not e10s: PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
--- a/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-wrap.html.ini
+++ b/testing/web-platform/meta/css/css-flexbox/ttwf-reftest-flex-wrap.html.ini
@@ -1,4 +1,4 @@
 [ttwf-reftest-flex-wrap.html]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-font-loading/idlharness.https.html.ini
+++ b/testing/web-platform/meta/css/css-font-loading/idlharness.https.html.ini
@@ -1,23 +1,23 @@
 [idlharness.https.html]
   [FontFace interface: attribute variationSettings]
     expected:
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if ((os == "mac") and (version == "OS X 10.14")) or (version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [FontFaceSet interface object length]
     expected: FAIL
 
   [FontFace interface: new FontFace("family", "src") must inherit property "variationSettings" with the proper type]
     expected:
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       if ((os == "mac") and (version == "OS X 10.14")) or (version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [FontFace interface: fontFace must inherit property "variationSettings" with the proper type]
     expected:
       if (os == "win") and (version == "6.1.7601"): FAIL
       if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
--- a/testing/web-platform/meta/css/css-fonts/calc-in-font-variation-settings.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/calc-in-font-variation-settings.html.ini
@@ -1,9 +1,9 @@
 [calc-in-font-variation-settings.html]
   [calc() in font-variation-settings]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/font-display/font-display-feature-policy-02.tentative.html.ini
@@ -3,9 +3,9 @@
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    if (os == "win") and (processor == "aarch64"): FAIL
\ No newline at end of file
+    if (os == "win") and (processor == "aarch64"): FAIL
--- a/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
@@ -1,3 +1,3 @@
 [font-size-adjust-002.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-inherit.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-inherit.html.ini
@@ -1,25 +1,25 @@
 [font-variation-settings-inherit.html]
   [Test font-variation-settings for duplicates using 'yyyy' 1, 'yyyy' 2]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Test font-variation-settings for child inheritance]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Test font-variation-settings for child override]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL 
 
--- a/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-parsing.html.ini
+++ b/testing/web-platform/meta/css/css-fonts/variations/font-variation-settings-parsing.html.ini
@@ -1,185 +1,185 @@
 [font-variation-settings-parsing.html]
   [Property value: Axis tag with valid non-letter ascii characters]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Invalid character below allowed range (first char)]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Invalid character above allowed range (mid char)]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Axis values in scientific form are valid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: 'normal' value is valid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Tag with less than 4 characters is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Tag with more than 4 characters is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Trailing comma is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Unquoted tags are invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Unmatched quotes around tag are invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Tag without value isinvalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Value without tag is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Value before tag is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Missing comma between axes is invalid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Calculations should be supported]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Units should not be supported]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Units should not be supported (in calc)]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Percentages should not be supported]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Property value: Percentages should not be supported (in calc)]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [@supports: Axis tag with valid non-letter ascii characters]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [@supports: Axis values in scientific form are valid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [@supports: 'normal' value is valid]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [@supports: Calculations should be supported]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "linux"): PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-sizing-alignment-001.html.ini
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-sizing-alignment-001.html.ini
@@ -1,3 +1,3 @@
 [grid-items-sizing-alignment-001.html]
   disabled:
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
+    if os == "android" and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1511369
--- a/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini
+++ b/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-armenian.html.ini
@@ -1,5 +1,5 @@
 [marker-text-matches-armenian.html]
   expected:
     if (os == "win") and (version == "6.1.7601"): FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-georgian.html.ini
+++ b/testing/web-platform/meta/css/css-lists/content-property/marker-text-matches-georgian.html.ini
@@ -1,5 +1,5 @@
 [marker-text-matches-georgian.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini
+++ b/testing/web-platform/meta/css/css-masking/clip/clip-transform-order-2.html.ini
@@ -1,4 +1,4 @@
 [clip-transform-order-2.html]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
   bug: https://github.com/web-platform-tests/wpt/pull/12187
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
@@ -1,3 +1,3 @@
 [multicol-count-computed-003.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
@@ -1,3 +1,3 @@
 [multicol-count-computed-004.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
@@ -1,3 +1,3 @@
 [multicol-count-computed-005.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
@@ -1,3 +1,3 @@
 [multicol-gap-large-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
@@ -1,3 +1,3 @@
 [multicol-rule-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
@@ -1,3 +1,3 @@
 [multicol-rule-fraction-003.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
@@ -1,3 +1,3 @@
 [multicol-rule-px-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
@@ -1,3 +1,3 @@
 [multicol-rule-shorthand-2.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
@@ -1,3 +1,3 @@
 [multicol-rule-stacking-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
@@ -1,3 +1,3 @@
 [multicol-shorthand-001.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini
@@ -1,4 +1,4 @@
 [multicol-span-all-margin-001.xht]
   prefs: [layout.css.column-span.enabled:true]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini
@@ -1,4 +1,4 @@
 [multicol-span-all-margin-002.xht]
   prefs: [layout.css.column-span.enabled:true]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini
@@ -1,4 +1,4 @@
 [multicol-span-all-margin-nested-001.xht]
   prefs: [layout.css.column-span.enabled:true]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini
@@ -1,4 +1,4 @@
 [multicol-span-all-margin-nested-firstchild-001.xht]
   prefs: [layout.css.column-span.enabled:true]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini
+++ b/testing/web-platform/meta/css/css-position/position-sticky-hyperlink.html.ini
@@ -1,5 +1,5 @@
 [position-sticky-hyperlink.html]
   expected:
     if os == "win": FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-position/position-sticky-table-parts.html.ini
+++ b/testing/web-platform/meta/css/css-position/position-sticky-table-parts.html.ini
@@ -1,5 +1,5 @@
 [position-sticky-table-parts.html]
   expected:
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
-    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
\ No newline at end of file
+    if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
--- a/testing/web-platform/meta/css/css-position/z-index-blend-will-change-overlapping-layers.html.ini
+++ b/testing/web-platform/meta/css/css-position/z-index-blend-will-change-overlapping-layers.html.ini
@@ -1,3 +1,3 @@
 [z-index-blend-will-change-overlapping-layers.html]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-pseudo/first-letter-property-whitelist.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/first-letter-property-whitelist.html.ini
@@ -14,17 +14,17 @@
   [Whitelisted property borderRadius should be applied to first-letter pseudo elements.]
     expected: FAIL
 
   [Whitelisted property font should be applied to first-letter pseudo elements.]
     expected: FAIL
 
   [Whitelisted property fontVariationSettings should be applied to first-letter pseudo elements.]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       if (os == "mac") and (version == "OS X 10.14" or version == "OS X 10.13"): PASS
       if (os == "linux"): PASS
       if (os == "win") and (version == "10.0.17134"): PASS
       FAIL
 
   [Whitelisted property margin should be applied to first-letter pseudo elements.]
     expected: FAIL
 
--- a/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
@@ -1,5 +1,5 @@
 [marker-inherit-line-height.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html.ini
+++ b/testing/web-platform/meta/css/css-scroll-anchoring/start-edge-in-block-layout-direction.html.ini
@@ -1,21 +1,21 @@
 [start-edge-in-block-layout-direction.html]
   [Vertical-RL LTR.]
     expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Horizontal RTL.]
     expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Vertical-LR LTR.]
     expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Vertical-RL RTL.]
     expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Vertical-LR RTL.]
     expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
+++ b/testing/web-platform/meta/css/css-scrollbars/textarea-scrollbar-width-none.html.ini
@@ -1,8 +1,8 @@
 [textarea-scrollbar-width-none.html]
   prefs: [layout.css.scrollbar-width.enabled:true]
   expected:
     if (os == "win") and (processor == "aarch64"): PASS
     if (os == "win") and (version == "6.1.7601"): FAIL
     if not webrender and (os == "win") and (version == "10.0.17134"): FAIL
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-001.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-margin-001.html.ini
@@ -1,29 +1,29 @@
 [shape-margin-001.html]
 
   [10ex - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [10vh - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1514429
 
   [10vmin - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1514429
 
   [10vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1514429
 
   [10vmax - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
     bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1514429
 
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-circle-005.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-circle-005.html.ini
@@ -4,17 +4,17 @@
 
   [test unit: mm - circle(50mm) - computed]
     expected: FAIL
 
   [test unit: ex - circle(50ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: cm - circle(50cm) - inline]
     expected: FAIL
 
   [test unit: mm - circle(50mm) - inline]
     expected: FAIL
 
@@ -48,22 +48,22 @@
   [test unit: vmin - circle(50vmin) - inline]
     expected: FAIL
 
   [test unit: vmax - circle(50vmax) - inline]
     expected: FAIL
 
   [test unit: vw - circle(50vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - circle(50vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - circle(50vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - circle(50vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-ellipse-004.html.ini
@@ -106,27 +106,27 @@
 
   [test unit (computed): in - ellipse(at bottom 70in left 50%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at right 80ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): em - ellipse(at top 50em right 80em)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 50% 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): vw - ellipse(at bottom 70vw left 50%)]
     expected: FAIL
 
   [test unit (computed): cm - ellipse(at 50cm)]
     expected: FAIL
 
@@ -138,40 +138,40 @@
 
   [test unit (computed): in - ellipse(at bottom 70in right 80in)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at left 50ex top 50%)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): cm - ellipse(at left 50cm bottom 70cm)]
     expected: FAIL
 
   [test unit (computed): pt - ellipse(at right 80% bottom 70pt)]
     expected: FAIL
 
   [test unit (computed): cm - ellipse(at left 50cm)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 70ex bottom)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ex - ellipse(at right 80% top 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): pc - ellipse(at left 50% bottom 70pc)]
     expected: FAIL
 
   [test unit (computed): em - ellipse(at right 80em bottom 70em)]
     expected: FAIL
 
@@ -231,17 +231,17 @@
 
   [test unit (computed): in - ellipse(at right 80in bottom 70%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 50ex 50%)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): em - ellipse(at top 50% right 80em)]
     expected: FAIL
 
   [test unit (computed): pt - ellipse(at right 80pt bottom 70%)]
     expected: FAIL
 
@@ -256,17 +256,17 @@
 
   [test unit (computed): vh - ellipse(at bottom 70% right 80vh)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 60ex center)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ch - ellipse(at bottom 70ch right 80%)]
     expected: FAIL
 
   [test unit (computed): mm - ellipse(at right 80mm top 50mm)]
     expected: FAIL
 
@@ -344,27 +344,27 @@
 
   [test unit (computed): vh - ellipse(at bottom 70vh left 50vh)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at bottom 70% left 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): pt - ellipse(at bottom 70pt left 50pt)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at top 50ex left 50%)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): cm - ellipse(at bottom 70cm left 50%)]
     expected: FAIL
 
   [test unit (computed): vw - ellipse(at top 50vw right 80vw)]
     expected: FAIL
 
@@ -448,17 +448,17 @@
 
   [test unit (computed): vmax - ellipse(at left 50% bottom 70vmax)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at top 50ex left 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ex - ellipse(at bottom 70ex left 50ex)]
     expected: FAIL
 
   [test unit (computed): rem - ellipse(at left 50rem bottom 70rem)]
     expected: FAIL
 
@@ -488,40 +488,40 @@
 
   [test unit (computed): pt - ellipse(at bottom 70pt right 80pt)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at center 60ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): pc - ellipse(at bottom 70pc right 80%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 50ex top)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ch - ellipse(at right 80ch top 50ch)]
     expected: FAIL
 
   [test unit (computed): vw - ellipse(at bottom 70vw right 80vw)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): pt - ellipse(at bottom 70% right 80pt)]
     expected: FAIL
 
   [test unit (computed): rem - ellipse(at top 50% right 80rem)]
     expected: FAIL
 
@@ -548,17 +548,17 @@
 
   [test unit (computed): ex - ellipse(at right 80ex bottom 70%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at left 50ex bottom 70%)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): vh - ellipse(at bottom 70vh right 80vh)]
     expected: FAIL
 
   [test unit (computed): vmax - ellipse(at right 80vmax bottom 70%)]
     expected: FAIL
 
@@ -585,17 +585,17 @@
 
   [test unit (computed): in - ellipse(at bottom 70% right 80in)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at top 50% left 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ex - ellipse(at right 80ex top 50%)]
     expected: FAIL
 
   [test unit (computed): vmin - ellipse(at bottom 70vmin left 50%)]
     expected: FAIL
 
@@ -616,17 +616,17 @@
 
   [test unit (computed): cm - ellipse(at bottom 70cm right 80cm)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at top 50ex right 80%)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ch - ellipse(at bottom 70ch left 50%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at right 80ex top 50ex)]
     expected: FAIL
 
@@ -656,17 +656,17 @@
 
   [test unit (computed): vmin - ellipse(at bottom 70vmin left 50vmin)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at left 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): cm - ellipse(at top 50cm right 80cm)]
     expected: FAIL
 
   [test unit (computed): rem - ellipse(at bottom 70rem right 80%)]
     expected: FAIL
 
@@ -681,40 +681,40 @@
 
   [test unit (computed): vw - ellipse(at top 50% right 80vw)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at 50ex 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): rem - ellipse(at bottom 70rem left 50rem)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at bottom 70% right 80ex)]
     expected: FAIL
 
   [test unit (computed): in - ellipse(at bottom 70in right 80%)]
     expected: FAIL
 
   [test unit (computed): ex - ellipse(at left 50% top 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): ex - ellipse(at left 50ex top 50ex)]
     expected:
       if os == "win": PASS
       if os == "mac": PASS
-      if os == "android": PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit (computed): vh - ellipse(at right 80vh top 50%)]
     expected: FAIL
 
   [test unit (computed): pc - ellipse(at bottom 70% right 80pc)]
     expected: FAIL
 
@@ -1561,326 +1561,326 @@
   [test unit (inline): ch - ellipse(at bottom 70% right 80ch)]
     expected: FAIL
 
   [test unit (inline): em - ellipse(at left 50% top 50em)]
     expected: FAIL
 
   [test unit (computed): vw - ellipse(at top 50vw right 80%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 50vmax 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at center 60vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at top 50vh left 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 50% 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at left 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at left 50vw top 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at right 80vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 60vmax center)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at top 50vh right 80%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at left 50% top 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 50vw 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at right 80% top 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at top 50vmin left 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at top 50vmax right 80%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at left 50% top 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at left 50vh bottom 70%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 50% 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at left 50vmin bottom 70%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at right 80vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at right 80vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at top 50vmin left 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at center 60vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at left 50% top 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at right 80% top 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at right 80% top 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at left 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at bottom 70% left 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 50vh 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at right 80% top 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 50% 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 70vw bottom)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at left 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at left 50vh top 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 50vh top)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at top 50% left 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at left 50vmax top 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 50vw 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 50vmin 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 50vmin top)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 50vh 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at left 50vw top 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 50% 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 60vh center)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at left 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at top 50vw left 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at top 50vmax left 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at left 50vmin top 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 50vw top)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at top 50% left 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at left 50% top 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at center 60vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 50vmin 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at top 50vh left 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at right 80vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 70vmax bottom)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at top 50vmin right 80%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at left 50vw bottom 70%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at center 60vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at top 50vmax left 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 60vmin center)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at bottom 70% left 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 50vmax top)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at top 50% left 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at left 50vmax bottom 70%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at top 50% left 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at left 50vmax top 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at left 50vh top 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at 70vmin bottom)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at 70vh bottom)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at bottom 70% left 50vw)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 50vmax 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vh - ellipse(at bottom 70% left 50vh)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at top 50vw left 50%)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmin - ellipse(at left 50vmin top 50vmin)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vw - ellipse(at 60vw center)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit (computed): vmax - ellipse(at 50vmax)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-
+      if os == "android" and not e10s: FAIL
+
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-ellipse-005.html.ini
@@ -157,62 +157,62 @@
 
   [test unit: ex - ellipse(50ex) - computed]
     expected: FAIL
 
   [test unit: ex - ellipse(50ex 100ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(100ex 100px) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(50ex 25%) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(25% 50ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(25ex closest-side) - computed]
     expected: FAIL
 
   [test unit: ex - ellipse(closest-side 75ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(25ex farthest-side) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ex - ellipse(farthest-side 75ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [test unit: ch - ellipse(50ch) - computed]
     expected: FAIL
 
   [test unit: ch - ellipse(25ch closest-side) - computed]
     expected: FAIL
 
@@ -516,118 +516,118 @@
   [test unit: vmin - ellipse(farthest-side 75vmin) - inline]
     expected: FAIL
 
   [test unit: vh - ellipse(closest-side 75vh) - inline]
     expected: FAIL
 
   [test unit: vw - ellipse(25vw farthest-side) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(50vh 25%) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(25% 50vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(50vmin 25%) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(closest-side 75vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(25% 50vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(25vh farthest-side) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(closest-side 75vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(25vmin farthest-side) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(25% 50vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(closest-side 75vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(farthest-side 75vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(25% 50vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(50vw 25%) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(closest-side 75vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(50vh 100vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(50vw 100vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(farthest-side 75vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(100vh 100px) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(50vmin 100vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(50vmax 25%) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(100vw 100px) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(100vmax 100px) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(25vmax farthest-side) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vh - ellipse(farthest-side 75vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vw - ellipse(farthest-side 75vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmin - ellipse(100vmin 100px) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [test unit: vmax - ellipse(50vmax 100vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-inset-003.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-inset-003.html.ini
@@ -118,464 +118,464 @@
 
   [inset(10mm round 10mm 20mm 30mm 40mm / 10mm 20mm 30mm 40mm) - computed]
     expected: FAIL
 
   [inset(10ex round 10ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex / 10ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex / 10ex 20ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex / 10ex 20ex 30ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex / 10ex 20ex 30ex 40ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex / 10ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex / 10ex 20ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex / 10ex 20ex 30ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex / 10ex 20ex 30ex 40ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex / 10ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex / 10ex 20ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex / 10ex 20ex 30ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex / 10ex 20ex 30ex 40ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex 40ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex 40ex / 10ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex 40ex / 10ex 20ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex 40ex / 10ex 20ex 30ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10ex round 10ex 20ex 30ex 40ex / 10ex 20ex 30ex 40ex) - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax 40vmax / 10vmax 20vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax / 10vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin 40vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin / 10vmin 20vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin 40vmin / 10vmin 20vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax 40vmax / 10vmax 20vmax 30vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw / 10vw 20vw 30vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin 40vmin / 10vmin 20vmin 30vmin 40vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax / 10vmax 20vmax 30vmax 40vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin / 10vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax / 10vmax 20vmax 30vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw / 10vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin / 10vmin 20vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw / 10vw 20vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax / 10vmax 20vmax 30vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh / 10vh 20vh 30vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw / 10vw 20vw 30vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh 40vh / 10vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh / 10vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh / 10vh 20vh 30vh 40vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh / 10vh 20vh 30vh 40vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax / 10vmax 20vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh / 10vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh 40vh / 10vh 20vh 30vh 40vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh / 10vh 20vh 30vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh / 10vh 20vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin / 10vmin 20vmin 30vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw / 10vw 20vw 30vw 40vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax / 10vmax 20vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax / 10vmax 20vmax 30vmax 40vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw / 10vw 20vw 30vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax 40vmax / 10vmax 20vmax 30vmax 40vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin / 10vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin / 10vmin 20vmin 30vmin 40vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax 40vmax / 10vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin / 10vmin 20vmin 30vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin 40vmin / 10vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw 40vw / 10vw 20vw 30vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin / 10vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin / 10vmin 20vmin 30vmin 40vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax / 10vmax 20vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax 40vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh / 10vh 20vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh / 10vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw 40vw / 10vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin / 10vmin 20vmin 30vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax / 10vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw / 10vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax / 10vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin / 10vmin 20vmin 30vmin 40vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax / 10vmax 20vmax 30vmax 40vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax 30vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw 40vw / 10vw 20vw 30vw 40vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin 40vmin / 10vmin 20vmin 30vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh 40vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh / 10vh 20vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh / 10vh 20vh 30vh 40vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw / 10vw 20vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw / 10vw 20vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw 40vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw / 10vw 20vw 30vw 40vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh 40vh / 10vh 20vh 30vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh 30vh 40vh / 10vh 20vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw 30vw 40vw / 10vw 20vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vh round 10vh 20vh / 10vh 20vh 30vh) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw / 10vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmax round 10vmax 20vmax / 10vmax 20vmax 30vmax) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vw round 10vw 20vw / 10vw 20vw 30vw 40vw) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [inset(10vmin round 10vmin 20vmin 30vmin / 10vmin 20vmin) - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-polygon-004.html.ini
@@ -1,28 +1,28 @@
 [shape-outside-polygon-004.html]
   [Three vertices - ex ex, ex ex, ex ex - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Three vertices - em em, em em, ex ex - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Three vertices - ex ex, em, em, em em - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [One vertex - cm cm - computed]
     expected: FAIL
 
   [One vertex - cm mm - computed]
     expected: FAIL
 
@@ -47,70 +47,70 @@
   [Three vertices - cm cm, mm mm, pc pc - computed]
     expected: FAIL
 
   [Three vertices - pc pc, cm, cm, mm mm - computed]
     expected: FAIL
 
   [Two vertices - vw vw, vh vh - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Two vertices - vmin vmin, vmin vmin - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vw vw, vh vh, % % - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - % %, vw, vw, vh vh - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vw vw, vw vw, vw vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vmax vmax, vmin, vmin, vmin vmin - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vmin vmin, vmin vmin, vmin vmin - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vh vh, vh vh, vh vh - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vmin vmin, vmin vmin, vmax vmax - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Two vertices - vw vh, vh vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [One vertex - vw vh - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Three vertices - vmax vmax, vmax vmax, vmax vmax - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Two vertices - vh vh, vw vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [One vertex - vmin vmin - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Two vertices - vw vw, vw vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [One vertex - vw vw - computed]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html.ini
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/values/shape-outside-shape-arguments-000.html.ini
@@ -1,14 +1,14 @@
 [shape-outside-shape-arguments-000.html]
   [Font relative units - computed]
     expected:
       if (os == "win"): PASS
       if (os == "mac"): PASS
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [View relative units - computed]
     expected:
       if (os == "mac"): PASS
       if (os == 'win' and processor == 'aarch64'): PASS
       FAIL
 
--- a/testing/web-platform/meta/css/css-tables/table-model-fixup-2.html.ini
+++ b/testing/web-platform/meta/css/css-tables/table-model-fixup-2.html.ini
@@ -1,78 +1,78 @@
 [table-model-fixup-2.html]
   disabled:
     if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1445164
   [Replaced elements outside a table cannot be table-row and are considered block -- input=text elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row and are considered block -- input=button elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row and are considered block -- input=file elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row and are considered block -- img elements]
     expected: FAIL
 
   [Replaced elements outside a table cannot be table-row-group and are considered block -- input=text elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row-group and are considered block -- input=button elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row-group and are considered block -- input=file elements]
     expected:
-      if (os == "android"): PASS
+      if os == "android" and not e10s: PASS
       FAIL
 
   [Replaced elements outside a table cannot be table-row-group and are considered block -- img elements]
     expected: FAIL
 
   [Replaced elements outside a table cannot be table and are considered block -- img elements]
     disabled: https://bugzilla.mozilla.org/show_bug.cgi?id=1445164
 
   [Replaced elements outside a table cannot be table-column and are considered inline -- input=text elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be inline-table and are considered inline -- input=text elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be table-cell and are considered inline -- input=button elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be table-cell and are considered inline -- input=text elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be inline-table and are considered inline -- input=file elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be inline-table and are considered inline -- input=button elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be table-column and are considered inline -- input=button elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be table-cell and are considered inline -- input=file elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
   [Replaced elements outside a table cannot be table-column and are considered inline -- input=file elements]
     expected:
-      if (os == "android"): FAIL
+      if os == "android" and not e10s: FAIL
 
--- a/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-021.html.ini
+++ b/testing/web-platform/meta/css/css-text-decor/text-emphasis-style-021.html.ini
@@ -1,4 +1,4 @@
 [text-emphasis-style-021.html]
   expected:
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     FAIL
--- a/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini
+++ b/testing/web-platform/meta/css/css-text/boundary-shaping/boundary-shaping-010.html.ini
@@ -1,4 +1,4 @@
 [boundary-shaping-010.html]
   expected:
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/letter-spacing/letter-spacing-control-chars-001.html.ini
+++ b/testing/web-platform/meta/css/css-text/letter-spacing/letter-spacing-control-chars-001.html.ini
@@ -1,3 +1,3 @@
 [letter-spacing-control-chars-001.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-014.html.ini
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-014.html.ini
@@ -1,4 +1,4 @@
 [line-breaking-014.html]
   expected:
     if os == "mac": FAIL
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/shaping/shaping_lig-000.html.ini
+++ b/testing/web-platform/meta/css/css-text/shaping/shaping_lig-000.html.ini
@@ -1,3 +1,3 @@
 [shaping_lig-000.html]
   expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-001.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-001.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-001.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-002.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-002.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-002.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-003.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-003.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-003.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-004.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-004.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-004.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-005.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-005.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-005.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-006.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-006.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-006.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-007.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-007.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-007.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-008.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-008.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-008.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-009.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-009.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-009.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-010.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-010.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-010.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-014.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-014.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-014.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-015.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-015.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-015.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-016.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-016.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-016.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-end-017.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-end-017.html.ini
@@ -1,5 +1,5 @@
 [text-align-end-017.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-001.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-001.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-001.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-002.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-002.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-002.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-003.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-003.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-003.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-004.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-004.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-004.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-005.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-005.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-005.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-justify-006.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-justify-006.html.ini
@@ -1,5 +1,5 @@
 [text-align-justify-006.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-001.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-001.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-001.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-002.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-002.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-002.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-003.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-003.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-003.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-004.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-004.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-004.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-005.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-005.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-005.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-006.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-006.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-006.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-007.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-007.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-007.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-008.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-008.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-008.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-009.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-009.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-009.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-010.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-010.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-010.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-014.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-014.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-014.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-015.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-015.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-015.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-016.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-016.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-016.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-align/text-align-start-017.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-align/text-align-start-017.html.ini
@@ -1,5 +1,5 @@
 [text-align-start-017.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini
+++ b/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-001.xht.ini
@@ -1,3 +1,3 @@
 [text-indent-percentage-001.xht]
   expected:
-    if os == "android": FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-004.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-indent/text-indent-percentage-004.html.ini
@@ -1,5 +1,5 @@
 [text-indent-percentage-004.html]
   expected:
     if (os == "mac"): FAIL
     if (os == "linux"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/text-justify/text-justify-001.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-justify/text-justify-001.html.ini
@@ -1,5 +1,5 @@
 [text-justify-001.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
     if (os == "linux"): FAIL
--- a/testing/web-platform/meta/css/css-text/text-transform/text-transform-upperlower-006.html.ini
+++ b/testing/web-platform/meta/css/css-text/text-transform/text-transform-upperlower-006.html.ini
@@ -1,5 +1,5 @@
 [text-transform-upperlower-006.html]
   expected:
     if (os == "win"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
+++ b/testing/web-platform/meta/css/css-text/white-space/text-space-collapse-preserve-breaks-001.xht.ini
@@ -1,11 +1,11 @@
 [text-space-collapse-preserve-breaks-001.xht]
   expected:
-    if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if os == "android" and not e10s: FAIL
     if os == "win": FAIL
     if os == "mac": FAIL
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
     if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
     if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
--- a/testing/web-platform/meta/css/css-text/word-break/word-break-normal-bo-000.html.ini
+++ b/testing/web-platform/meta/css/css-text/word-break/word-break-normal-bo-000.html.ini
@@ -1,4 +1,4 @@
 [word-break-normal-bo-000.html]
   expected:
     if (os == "win") and (version == "10.0.17134"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/scaley.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/scaley.html.ini
@@ -1,6 +1,6 @@
 [scaley.html]
   expected:
     if (os == "win"): FAIL
     if (os == "linux"): FAIL
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-3d-rotateY-stair-above-001.xht.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-3d-rotateY-stair-above-001.xht.ini
@@ -1,4 +1,4 @@
 [transform-3d-rotateY-stair-above-001.xht]
   expected:
     if webrender: FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-3d-rotateY-stair-below-001.xht.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-3d-rotateY-stair-below-001.xht.ini
@@ -1,6 +1,6 @@
 [transform-3d-rotateY-stair-below-001.xht]
   expected:
     if (os == "mac"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     if (os == "win") and (processor == "aarch64"): PASS
     FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
@@ -1,3 +1,3 @@
 [transform-applies-to-002.xht]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-background-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-background-003.html.ini
@@ -1,3 +1,3 @@
 [transform-background-003.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-background-004.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-background-004.html.ini
@@ -1,3 +1,3 @@
 [transform-background-004.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-background-005.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-background-005.html.ini
@@ -1,3 +1,3 @@
 [transform-background-005.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-001.html.ini
@@ -1,3 +1,3 @@
 [transform-input-001.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-002.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-002.html.ini
@@ -1,4 +1,4 @@
 [transform-input-002.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-003.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-003.html.ini
@@ -1,3 +1,3 @@
 [transform-input-003.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-004.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-004.html.ini
@@ -1,3 +1,3 @@
 [transform-input-004.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-005.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-005.html.ini
@@ -1,3 +1,3 @@
 [transform-input-005.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-006.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-006.html.ini
@@ -1,3 +1,3 @@
 [transform-input-006.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-008.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-008.html.ini
@@ -1,3 +1,3 @@
 [transform-input-008.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-009.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-009.html.ini
@@ -1,4 +1,4 @@
 [transform-input-009.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-010.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-010.html.ini
@@ -1,3 +1,3 @@
 [transform-input-010.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-012.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-012.html.ini
@@ -1,4 +1,4 @@
 [transform-input-012.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-013.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-013.html.ini
@@ -1,3 +1,3 @@
 [transform-input-013.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-014.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-014.html.ini
@@ -1,4 +1,4 @@
 [transform-input-014.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-015.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-015.html.ini
@@ -1,3 +1,3 @@
 [transform-input-015.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-017.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-017.html.ini
@@ -1,3 +1,3 @@
 [transform-input-017.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-018.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-018.html.ini
@@ -1,3 +1,3 @@
 [transform-input-018.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-input-019.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-input-019.html.ini
@@ -1,4 +1,4 @@
 [transform-input-019.html]
   expected:
     if (os == "mac"): FAIL
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-caption-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-caption-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-caption-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-tbody-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-tbody-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-td-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-td-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-td-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-tfoot-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-tfoot-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-th-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-th-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-th-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-thead-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-thead-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-thead-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform-transformed-tr-contains-fixed-position.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform-transformed-tr-contains-fixed-position.html.ini
@@ -1,3 +1,3 @@
 [transform-transformed-tr-contains-fixed-position.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transform3d-preserve3d-001.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transform3d-preserve3d-001.html.ini
@@ -1,7 +1,7 @@
 [transform3d-preserve3d-001.html]
   expected:
     if (os == "mac"): PASS
     if webrender and (os == "linux"): PASS
-    if (os == "android"): PASS
+    if os == "android" and not e10s: PASS
     if (os == "win") and (processor == "aarch64"): PASS
     FAIL
--- a/testing/web-platform/meta/css/css-transforms/transforms-rotateY-degree-60.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transforms-rotateY-degree-60.html.ini
@@ -1,3 +1,3 @@
 [transforms-rotateY-degree-60.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-transforms/transofrmed-preserve-3d-1.html.ini
+++ b/testing/web-platform/meta/css/css-transforms/transofrmed-preserve-3d-1.html.ini
@@ -1,3 +1,3 @@
 [transofrmed-preserve-3d-1.html]
   expected:
-    if (os == "android"): FAIL
+    if os == "android" and not e10s: FAIL
--- a/testing/web-platform/meta/css/css-ui/appearance-cssom-001.html.ini
+++ b/testing/web-platform/meta/css/css-ui/appearance-cssom-001.html.ini
@@ -563,562 +563,562 @@
   [appearance: tab-scroll-arrow-forward  (invalid)]
     expected: FAIL
 
   [-webkit-appearance: scale-horizontal (invalid)]
     expected: FAIL
 
   [-webkit-appearance: -moz-window-frame-bottom (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: menuseparator (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-volume-slider-container (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: attachment (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-win-borderless-glass (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-exit-fullscreen-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: sliderthumb-horizontal (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: menulist-text]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button-arrow-previous (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: statusbar (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: list-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: radio-container (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: menupopup (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: discrete-capacity-level-indicator (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: scrollbarbutton-left (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: checkmenuitem (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: toolbox (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: toolbarbutton (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: tab-scroll-arrow-back (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: tab (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: color-well (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treeheader (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: splitter (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: listbox]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: image-controls-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-win-exclude-glass (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -apple-pay-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button-bevel]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-window-button-minimize (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treeheadersortarrow (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: snapshotted-plugin-overlay (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: spinner-textfield (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: sheet (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treeline (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-controls-background (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: searchfield-decoration (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-window-frame-left (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: toolbar (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: spinner-upbutton (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-win-communicationstext (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: checkbox]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-window-button-close (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-rewind-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: progresschunk (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: rating-level-indicator (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: bogus-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-controls-fullscreen-background (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treeheadercell (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: scrollbarbutton-up (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-seek-forward-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: caret]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: relevancy-level-indicator (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-current-time-display (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treetwistyopen (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: radiomenuitem (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: meterchunk (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: toolbarbutton-dropdown (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-window-titlebar (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: default-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-sliderthumb (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: menulist]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button-arrow-down (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-controls-light-bar-background (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-win-communications-toolbox (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: caps-lock-indicator (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: listitem]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: resizer (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: resizerpanel (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: dualbutton (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: searchfield-cancel-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: textarea]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: tab-scroll-arrow-forward  (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: treetwisty (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: radio-label (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: -moz-window-button-box (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: tabpanel (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: menuitemtext (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button-arrow-up (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: searchfield]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: toolbargripper (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-seek-back-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: button-focus (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL
 
   [-webkit-appearance: media-volume-slider-mute-button (invalid)]
     expected:
-      if not debug and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+      if os == "android" and not e10s: FAIL