Merge "ART: Fix race in on-stack replacement"