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

Change-Id: I78a3ec7ed8c7e438986515217d2e0b3613d89dce