am c871eec8: am e47cc002: am acb3ee85: Merge "Major refactoring of ElfBuilder."

* commit 'c871eec8acffacffd8254ba826a243581c4c79ce':
  Major refactoring of ElfBuilder.