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

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