am cff996e6: am 6939ba7f: am a3ed7f87: Merge "JNI dlsym lookup fixes."

* commit 'cff996e6d0fc029e3ebe2f6a5a7681cb6cdedbd9':