Merge changes I722d2c41,Ic216ddef

* changes:
  Improve test_adb.py
  adb: Distinguish betwen already-connected and connection failure