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

Change-Id: I62c8f1c466de213c25cd36d03b3b6d7c0a71b989