am a3ed7f87: Merge "JNI dlsym lookup fixes."

* commit 'a3ed7f874710bddd51487b331e7f288806c36307':
  JNI dlsym lookup fixes.