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

* commit '260846f374f88ba6686bff8ab33c17c487c7a8f7':
  Reinstate the x86 dynamic linker warning for text relocations.