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

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