Bug 871440: bypass offline for both B2G emulator ARM & x86. r=jgriffin

testing/marionette/marionette-actors.js

@@ -48,9 +48,11 @@ try {
     return libcutils;
   });
   if (libcutils) {
+    let qemu = libcutils.property_get("ro.kernel.qemu");
+    logger.info("B2G emulator: " + (qemu == "1" ? "yes" : "no"));
     let platform = libcutils.property_get("ro.product.device");
     logger.info("Platform detected is " + platform);
-    bypassOffline = (platform == "generic" || platform == "panda");
+    bypassOffline = (qemu == "1" || platform == "panda");
   }
 }
 catch(e) {}