Merge changes I70a3b6fe,Ib12f3474

* changes:
  Fix build by converting from bionic to elfutils version of elf.h
  Revert "Revert "Rewrite ElfWriterQuick to make it more modular.""