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

Change-Id: Ib8c88607aa02c321221edb4b01e0110bc6ac21d7