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

* commit '908d6ed1c450e0349d6a3984b6571c6584261ec3':
  adb: fix killing of old version of adb process