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

Change-Id: I19dfb9b61a94b9db7d96a4410f8c194cb0793bdc