Promise.timeout() doesn't stack (i.e. foo.timeout(1000).timeout(1000) doesn't mean "wait 1000ms, then another 1000ms", it means that we have two 1000ms timeouts running at the same time). Fix places where it could be a problem.

lib/roles/device/plugins/http.js

@@ -41,8 +41,8 @@ module.exports = syrup.serial()
             })
             .then(function() {
               return devutil.waitForPort(adb, options.serial, service.port)
+                .timeout(20000)
             })
-            .timeout(20000)
             .then(function(conn) {
               var ours = options.ports.pop()
                 , everyones = options.ports.pop()