Add getAdbServerPort function to adb
Merge branch 'master' of https://github.com/testobject/appium-adb