Merge "Allow multiple tcp adb connection to same device." am: 4818194a25 am: e060cdadc8
am: 2337e51f11

Change-Id: I6b450fe6704a3e0497abc1bc5edf251a8c2c025c