Merge "adb: fix double close in wait-for-*."