am e6dbb737: Merge "Minor refactoring of ElfBuilder."

* commit 'e6dbb737c1dc0157ff9b4020ac5ecce08a6c99a2':
  Minor refactoring of ElfBuilder.