Merge "Fix buffer overrun in adb wait-for-device."