Merge "Fix oatdump after ArtMethod change."