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

* commit '224aee2f5cebcccf832c8a204163192bc752c5a1':
  Don't allow text relocations on 64-bit.