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

Change-Id: Icd38fd6145b8393e55abcd48d56cf96e4e388b86