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

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