Merge "Prevent ArtMethod clearing race"
am: d6f3740718

* commit 'd6f374071804b3efe864f16d75fa22cb9971ed5a':
  Prevent ArtMethod clearing race

Change-Id: Ie1a353af4bbbccd6a79870db57aad41fa8f34f3d