Backed out changeset 4ed0a5b3a833 (bug 1865766) for causing reftests failures.

layout/tools/reftest/manifest.sys.mjs

@@ -720,11 +720,10 @@ function BuildConditionSandbox(aURL) {
   sandbox.transparentScrollbars = Services.appinfo.widgetToolkit == "gtk";
 
   if (sandbox.Android) {
+    // This is currently used to distinguish Android 4.0.3 (SDK version 15)
+    // and later from Android 2.x
     sandbox.AndroidVersion = Services.sysinfo.getPropertyAsInt32("version");
 
-    // Some reftests need extra fuzz on the Android 13 Pixel 5 devices.
-    sandbox.Android13 = sandbox.AndroidVersion == "33";
-
     sandbox.emulator = readGfxInfo(gfxInfo, "adapterDeviceID").includes(
       "Android Emulator"
     );
@@ -754,6 +753,7 @@ function BuildConditionSandbox(aURL) {
     "vendorSub",
     "product",
     "productSub",
+    "platform",
     "oscpu",
     "language",
     "misc",
@@ -761,6 +761,9 @@ function BuildConditionSandbox(aURL) {
   sandbox.http = new sandbox.Object();
   httpProps.forEach(x => (sandbox.http[x] = hh[x]));
 
+  // set to specific Android13 version (Pixel 5 in CI)
+  sandbox.Android13 = sandbox.Android && sandbox.http.platform == "Android 13";
+
   // Set OSX to be the Mac OS X version, as an integer, or undefined
   // for other platforms.  The integer is formed by 100 times the
   // major version plus the minor version, so 1006 for 10.6, 1010 for