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

Fixes #3717