Merge "ART: Fix interpreter single-step when doing OSR" am: dc80925
am: dc7e534

* commit 'dc7e534cd0a56380bf0d1934a368f90495c39064':
  ART: Fix interpreter single-step when doing OSR

Change-Id: Icc4ca25b95e1100e438e125ac8ecee7c851ed4e6