Merge "Fix adb tcpip tests."