Merge "adb: correct tcpip help message"