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

* commit '0bdbc499baf361e1b04ba97baf60e0ccdbddeb04':
  Reinstate the x86 dynamic linker warning for text relocations.