Merge "Minor linker cleanup, primarily to use Elf32_Dyn"