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

* commit '5ac52de019f2036b98252e602b4e8944d08ef3bc':
  Revert "Rewrite ElfWriterQuick to make it more modular."