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

Change-Id: I56b76c960cf9f5270cd7ea97cb4307d3323053c9