am 921b1e02: Merge changes I70a3b6fe,Ib12f3474

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