am 9d995d67: am 1cc09402: am f6721978: Merge "Fix x86 build to use <elf.h>."

# Via Android Git Automerger (2) and others
* commit '9d995d67217e44e022c9e5d0767634fa81f87b78':
  Fix x86 build to use <elf.h>.