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

Change-Id: I463ac35b909cbc3c5b6edeba2b370d4dc233f778