am 6175442a: Merge changes Ibe92d8b5,I9bada598

* commit '6175442a246cded6a9caae4658a0a1dc7cf49071':
  Make system use patchoat to relocate during runtime.
  Temporary fix for bad LIR generation in GenInlinedGet.