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

* commit '0d0b3fcc2a556ad04f7cb497ea69d0f657148580':