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

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