am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process"

* commit 'c1b6378d96dda18f1a6b9d9cf33f9ed4eb6f6603':
  adb: fix killing of old version of adb process