Merge "Clean up the argc/argv/envp/auxv handling."