Android O IOT Preview 7 (4635859)
Merge "Make StreamRedirector try to exhaust itself before exiting"