am 042cbb60: Merge "x86: art_quick_instrumentation_entry should not use offset address"

* commit '042cbb60dc25c16806b02d41dfad040861f727ad':
  x86: art_quick_instrumentation_entry should not use offset address