Wait for adb port to be available before starting

Any reason for changing the one var declaration to a few?