Merge "Fix some ArtMethod related bugs"