Bug 1535417 - Set dynamic mozinfo fields in Android test-verify; r=bc

In the mochitest harness, is_fennec is populated by examining harness options, and
is_emulator and android_version are populated by examining the device via mozdevice.
The per-test code doesn't have those options and the emulator may not be available
yet, so I've opted for populated those fields from mozharness configuration. In
practice, we only run Android TV on Android 4.3, where is_fennec=True, is_emulator=True,
and android_version=18. I'd like to run TV on Android 7.0/geckoview eventually,
where is_fennec=False, is_emulator=True, and android_version=24.
Since I was here, I also removed 'stylo' from the per-test mozinfo, since that field
is obsolete now.

Differential Revision: https://phabricator.services.mozilla.com/D23595

--HG--
extra : moz-landing-system : lando

testing/mozharness/configs/android/androidarm_4_3.py

@@ -31,4 +31,8 @@ config = {
     },
     "marionette_extra": "--emulator",
     "bogomips_minimum": 250,
+    # in support of test-verify
+    "android_version": 18,
+    "is_fennec": True,
+    "is_emulator": True,
 }

testing/mozharness/configs/android/androidx86_7_0.py

@@ -29,4 +29,8 @@ config = {
         # "LIBGL_DEBUG": "verbose"
     },
     "marionette_extra": "--emulator",
+    # in support of test-verify
+    "android_version": 24,
+    "is_fennec": False,
+    "is_emulator": True,
 }

testing/mozharness/mozharness/mozilla/testing/per_test_base.py

@@ -232,8 +232,12 @@ class SingleTestMixin(FetchesMixin):
         mozinfo.update({"e10s": e10s})
         headless = self.config.get('headless', False)
         mozinfo.update({"headless": headless})
-        # FIXME(emilio): Need to update test expectations.
-        mozinfo.update({'stylo': True})
+        if mozinfo.info['buildapp'] == 'mobile/android':
+            # extra android mozinfo normally comes from device queries, but this
+            # code may run before the device is ready, so rely on configuration
+            mozinfo.update({'android_version': self.config.get('android_version', 18)})
+            mozinfo.update({'is_fennec': self.config.get('is_fennec', True)})
+            mozinfo.update({'is_emulator': self.config.get('is_emulator', True)})
         mozinfo.update({'verify': True})
         self.info("Per-test run using mozinfo: %s" % str(mozinfo.info))