Merge "adb: fix flakiness in PTY shell protocol."