Merge "Switch <elf.h> over to linux uapi under the covers."