am 172e038f: am f09f6db5: Merge "Use the NetBSD <sys/exec_elf.h>."

# Via Android Git Automerger (1) and others
* commit '172e038f9e5b711a77afe7e8899343215cf25c9e':
  Use the NetBSD <sys/exec_elf.h>.