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