am 3b95d23f: Merge "Revert "Rewrite ElfWriterQuick to make it more modular.""

* commit '3b95d23f44485d207aa6ef298dc744fa2355578b':
  Revert "Rewrite ElfWriterQuick to make it more modular."