am a88fadae: am 40864df2: Merge "Rewrite ElfWriterQuick to make it more modular."

* commit 'a88fadae5deb6624811ab073e9e9240182035768':
  Rewrite ElfWriterQuick to make it more modular.