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

* commit 'e47cc002e73e2c253e0f5eea74e7c80511a5c413':
  Major refactoring of ElfBuilder.