am 486d99f0: Merge "Don\'t allow text relocations on 64-bit."

* commit '486d99f050a609c16641614edc72d71746ce859a':
  Don't allow text relocations on 64-bit.