Fix for Chromedriver not connecting to adb running on non-default port

Fixes #3717
See my comments on your related PR.  Once `getAdbServerPort` is static, change this to ```getAdbServerPort = require('./adb.js').getAdbServerPort;```