Android: upstream few more jni_generator changes.

base/android/jni_generator/testJNIInitNativeNameOption.golden

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/example/jni_generator/Test
 
 #ifndef org_chromium_example_jni_generator_Test_JNI
@@ skipping 41 matching lines @@
                            kMethodsTestSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, g_Test_clazz, __FILE__);
     return false;
   }
 
   return true;
 }
 
 extern "C" JNIEXPORT bool JNICALL
-Java_org_chromium_example_jni_generator_Test_initNativeClass(JNIEnv* env, jclass
-    clazz) {
+Java_org_chromium_example_jni_generator_Test_nativeInitNativeClass(JNIEnv* env,
+    jclass clazz) {
   return RegisterNativesImpl(env, clazz);
 }
 
 #endif  // org_chromium_example_jni_generator_Test_JNI