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

Change-Id: Id73338791ef4cd3aa08c2bc0b00b8b1410dd8461