Merge "Fix buffer overrun in adb wait-for-device." am: 1f13c1a208
am: b80557a608

* commit 'b80557a6081d48743254c1f12a141f3270dbc223':
  Fix buffer overrun in adb wait-for-device.