Fix buffer overrun in adb wait-for-device. am: 1ef5bf839e
am: 64d413499b

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