jni_generator: Wrap all native methods in stubs.

base/android/jni_generator/testMultipleJNIAdditionalImport.golden

Index: base/android/jni_generator/testMultipleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
index b0db9dd77200697b543fb4bb36dd192681758bf8..399eac83dd1b64ec3f558b01495907e14406700f 100644
--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
@@ -29,6 +29,13 @@ static void DoSomething(JNIEnv* env, jclass jcaller,
     jobject callback1,
     jobject callback2);
 
+static void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass
+    jcaller,
+    jobject callback1,
+    jobject callback2) {
+  return DoSomething(env, jcaller, callback1, callback2);
+}
+
 // Step 2: method stubs.
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
@@ -64,7 +71,7 @@ static const JNINativeMethod kMethodsFoo[] = {
 "Lorg/chromium/foo/Bar1$Callback;"
 "Lorg/chromium/foo/Bar2$Callback;"
 ")"
-"V", reinterpret_cast<void*>(DoSomething) },
+"V", reinterpret_cast<void*>(Java_org_chromium_foo_Foo_nativeDoSomething) },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env) {