am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit '99775d8751676e76e00ad72d7778ad9ba28cb454':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.