am 2b828991: (-s ours) Remove races from JNI_OnLoad invocation.

Merge commit '2b82899181108c4ed290f8c6b6be13759b59768f'

* commit '2b82899181108c4ed290f8c6b6be13759b59768f':
  Remove races from JNI_OnLoad invocation.