am 8310fc5e: am 6eef56fb: (-s ours) am 697869c4: am 6fefa36c: Merge "adb: Fix PTY logic for non-interactive shells."

* commit '8310fc5e7203a2fb995ef6f3e7e9ac80e75414ad':