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

Fixes #3717 
Depends on appium/appium-adb#47 being merged in.
If it gets complicated, just leave it.