Merge "Prevent ArtMethod clearing race" am: d6f3740718
am: ae148af696

* commit 'ae148af696dd464024e583e9cde13d0d93318a37':
  Prevent ArtMethod clearing race

Change-Id: I71cc6d9f5093bf7616f745d0b54f69994122eeeb