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

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