Merge "ART: Fix race in on-stack replacement" am: 250a23c am: 4766a4a
am: 085b698

* commit '085b698d555c465d96348f23aa816a0bfa40cb5b':
  ART: Fix race in on-stack replacement

Change-Id: I00a98bca303e8a0807cb95a25187cc05b75185f9