Update to new version of STFService. Also, there's actually no need to stop the service before starting it, because it will be done for us on reinstall.

lib/roles/device/plugins/service.js

@@ -89,8 +89,8 @@ module.exports = syrup.serial()
       return devutil.killProcsByComm(
         adb
       , options.serial
-      , 'app_process'
-      , 'app_process'
+      , 'stf.agent'
+      , 'stf.agent'
       )
     }
 
@@ -143,17 +143,12 @@ module.exports = syrup.serial()
         })
     }
 
+    // The APK should be up to date at this point. If it was reinstalled, the
+    // service should have been automatically stopped while it was happening.
+    // So, we should be good to go.
     function openService() {
       log.info('Launching service')
-      return stopService()
-        .timeout(15000)
-        .then(function() {
-          return devutil.waitForPortToFree(adb, options.serial, service.port)
-            .timeout(10000)
-        })
-        .then(function() {
-          return callService(util.format("-a '%s'", apk.startAction))
-        })
+      return callService(util.format("-a '%s'", apk.startAction))
         .then(function() {
           return devutil.waitForPort(adb, options.serial, service.port)
             .timeout(15000)
@@ -250,10 +245,6 @@ module.exports = syrup.serial()
       }
     }
 
-    function stopService() {
-      return callService(util.format("-a '%s'", apk.stopAction))
-    }
-
     function keyEvent(data) {
       return runAgentCommand(
         apk.wire.MessageType.DO_KEYEVENT