Merge "Ensure STDIN/STDOUT/STDERR always exist" am: 36501ba189
am: 59c27f9550

Change-Id: Idf22ab5d7cda8e61c0fde6f33e1bf01a734cba40