Merge "adb: correct tcpip help message" am: 19fb58ce57
am: aeb774304b

Change-Id: Ib4d41e0c095e9ec2167a1fe929eb9f5ae66aab10