am 142187e5: am 921b1e02: Merge changes I70a3b6fe,Ib12f3474

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