am 9207699c: am e6dbb737: Merge "Minor refactoring of ElfBuilder."

* commit '9207699cdc91ca858354e5008d729c1bbd3127c9':
  Minor refactoring of ElfBuilder.