Use generic name for JNI trampolines.
am: fe1d952a99

Change-Id: I0bca96738f78c7574a3dd41cfe9e95f8c1a8b047