Merge "adb: use TCP keepalive."
am: e663c163ac

* commit 'e663c163ac5f1931c2f9ebb091bf09a8a588432b':
  adb: use TCP keepalive.