Merge "adb: don't abort when connecting to the same address twice."
am: 60c6023902

Change-Id: I9fb8dd78288e4f5a3c6cc1ddb8a2cae8f2b81fce