am 260846f3: Merge "Reinstate the x86 dynamic linker warning for text relocations."