[automerger skipped] Merge "Remove unneeded JNI method" am: 1febe4196e  -s ours am: 8f66efbffe  -s ours
am: d9b9a52299  -s ours

Change-Id: Ic2e3ec3bf3ca60cc648196b30422494144972e8c