Merge "adb: Kill subprocess when the client exits."