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

* commit '45d56ef7773066af1fb107da3ffe20a591ec08f1':
  Minor refactoring of ElfBuilder.