am a96bea54: Merge "Fix some ArtMethod related bugs"

* commit 'a96bea54b7e3def5490d169f2bf92be2e68dd001':
  Fix some ArtMethod related bugs