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

Change-Id: I3a366342f1a94c34e0815e5941b7b13816a637c8