Merge "Put the legacy stdio fds back for pre-M."