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

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