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

* commit 'e024162070e3ce7e92a65e3b0f62dce7b8a8505a':
  Fix a mutator lock violation in the generic JNI end sequence.