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..eb15190a211793ea436c1275bf9a83083e8e4dfa 100644
--- a/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testMultipleJNIAdditionalImport.golden
@@ -25,11 +25,18 @@ jclass g_Foo_clazz = NULL;
 
 }  // namespace
 
+// Step 2: method stubs.
+
 static void DoSomething(JNIEnv* env, jclass jcaller,
     jobject callback1,
     jobject callback2);
 
-// Step 2: method stubs.
+static void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass
+    jcaller,
+    jobject callback1,
+    jobject callback2) {
+  return DoSomething(env, jcaller, callback1, callback2);
+}
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
 static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
@@ -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) {