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

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