Merge "ART: Fix race in on-stack replacement"
am: 250a23c

* commit '250a23c892bb809267325c0744c6f70fca49ac94':
  ART: Fix race in on-stack replacement

Change-Id: I73be63f71d7ad8c91ee617dee8e812cabf8bbbd3