Merge changes Ia8f83a53,Ia1f6a659

* changes:
  adbd: add a perfunctory abb test.
  adb: switch tests to python3.