am 6f67cd22: am 2f41531f: Merge "Clean up the argc/argv/envp/auxv handling."

# Via Android Git Automerger (1) and others
* commit '6f67cd224e6ffdfa2619849eb4b9b2ff6c1e2c59':
  Clean up the argc/argv/envp/auxv handling.