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

* commit '6eef56fb7acf78728840210ac104da9cc0d06fc9':