am c83614a8: (-s ours) am 59ae3947: am 3bcdaa28: Merge "Recognize IPv6 addresses for "adb connect"."

* commit 'c83614a8a5e3864ad423415fa76a3a503a92f337':