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

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