Merge "Move PC-relative addressing bases to a better position." am: b1aa617639
am: ba03f5e98d

* commit 'ba03f5e98d6affe2ae4b89abdb161cbf7ea42429':
  Move PC-relative addressing bases to a better position.