am 9e878d50: Merge "Tidy ELF builder."

* commit '9e878d50567f624094f3c4940ac3aedbc5eff3b9':
  Tidy ELF builder.