Merge "Fix wrong handling of Generic JNI not finding native method."