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

* commit '73fe920874bc9edc3e1642d4f8e11df7e4f7ab57':