Merge "Fix header file references to the ::llvm::ELF namespace."