am ea2b7625: am a96bea54: Merge "Fix some ArtMethod related bugs"

* commit 'ea2b7625af2b4d76a165e7aa80efd7574f185f49':
  Fix some ArtMethod related bugs