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

* commit 'c76ccd3e648a6bc1ce6fd920d420e983290a7245':