Bug 821012 - (Part 3) marionette install_busybox step should happen before install_gecko step, r=jgriffin

testing/marionette/client/marionette/emulator.py

@@ -338,7 +338,10 @@ waitFor(
         # setup DNS fix for networking
         self._run_adb(['shell', 'setprop', 'net.dns1', '10.0.2.3'])
 
-    def setup(self, marionette, gecko_path=None, load_early=False):
+    def setup(self, marionette, gecko_path=None, load_early=False, busybox=None):
+        if busybox:
+            self.install_busybox(busybox)
+
         if gecko_path:
             if load_early:
                 # Inject prefs into the profile now, since we have to restart

testing/marionette/client/marionette/marionette.py

@@ -150,9 +150,8 @@ class Marionette(object):
 
         if emulator:
             self.emulator.setup(self, gecko_path=gecko_path,
-                                load_early=load_early)
-            if busybox:
-                self.emulator.install_busybox(busybox)
+                                load_early=load_early,
+                                busybox=busybox)
 
     def __del__(self):
         if self.emulator: