Merge "Fix JDWP tests after ArtMethod change"