am f7c9b701: am 9cae50b3: Merge "Bound the ADB connect time with a non-blocking connect"

* commit 'f7c9b701c3b1da5acf26c767ad6bc1cb3014ccb1':
  Bound the ADB connect time with a non-blocking connect