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

* commit '82b1291cd46c37625a54e646bc04ac1828d03768':