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

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