am f000f7b2: (-s ours) am 70af6e0b: am 9508dcb9: Merge "adb: make stdin/stdout/stderr redirection errors fatal"

* commit 'f000f7b25074f75995477ac72ea2b0a749b87b05':