Merge "Fix adb hang when subprocess dies early."