Merge "Prevent ArtMethod clearing race" into nyc-dev