Clean up JNI dlsym lookup trampoline. am: 7dac864d7e
am: 64d5875071

Change-Id: Iaf4c7311935a5603a9352bcae24a1696f339e3a3