Merge "Restore default port for `adb connect`."