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

Change-Id: Ifd31be9341e80179c269d59c66c35f0ced9b7abf