Merge "Prevent ArtMethod clearing race" into nyc-dev
am: f8e5d94a12

* commit 'f8e5d94a121a207bea0f304eabeaaca194d5f0b9':
  Prevent ArtMethod clearing race

Change-Id: Ib817a1d68cb8a28e2962cdc8ca13820c803f9c99