Merge "adb: fix subprocess termination for legacy shell."