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

* commit '948eaeadead8b2a6499e4fbc8ba9b0752efcbd78':
  Fix some ArtMethod related bugs