Merge "Fix a mutator lock violation in the generic JNI end sequence."