Merge change 6800

* changes:
  Remove races from JNI_OnLoad invocation.