Use generic name for JNI trampolines. am: fe1d952a99
am: b5cdfb9b77

Change-Id: I90924f6f542e52ab51ed801f9c6956dbff5320a4