am 5f642969: am 968c8f07: Merge change 22503 into eclair

Merge commit '5f64296995844981fdfebebdd4b5d84044df3c28'

* commit '5f64296995844981fdfebebdd4b5d84044df3c28':
  adb: Improved support for running adb over TCP/IP