am 968c8f07: Merge change 22503 into eclair

Merge commit '968c8f07031c881dbb2e27b308d88f76e2917121' into eclair-plus-aosp

* commit '968c8f07031c881dbb2e27b308d88f76e2917121':
  adb: Improved support for running adb over TCP/IP