am 37a72bce: Merge "Fix text relocation for x86"

* commit '37a72bceaa585b7a4125a2366a2b7d31716685b9':
  Fix text relocation for x86