Allow adb to listen both on usb and tcp.

(cherry picked from commit 0ea81a752331b90c03dc305a0c08d91c05b98891 in master)

Change-Id: I980c7c5e8affbc8627d17b1d9303b002adcdb29a
Signed-off-by: Mike J. Chen <mjchen@google.com>

Conflicts:

	adb/adb.c
1 file changed