am a2517de3: am 036f9097: Merge "Minor linker cleanup, primarily to use Elf32_Dyn"

* commit 'a2517de3844d95b5f00a4666b8dae00ef893ac24':
  Minor linker cleanup, primarily to use Elf32_Dyn