Merge "Fix x86 build to use <elf.h>."