Update from https://crrev.com/318214

base/android/jni_generator/testNativeExportsOptionalOption.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/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
@@ skipping 12 matching lines @@
 // Leaking this jclass as we cannot use LazyInstance from some threads.
 base::subtle::AtomicWord g_SampleForTests_clazz __attribute__((unused)) = 0;
 #define SampleForTests_clazz(env) base::android::LazyGetClass(env, kSampleForTestsClassPath, &g_SampleForTests_clazz)
 
 }  // namespace
 
 extern "C" {
 
 static jint Init(JNIEnv* env, jobject jcaller);
 
-__attribute__((visibility("default"), alias("Init")))
+__attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyInnerClass_nativeInit(JNIEnv*
-    env, jobject jcaller);
+    env, jobject jcaller) {
+  return Init(env, jcaller);
+}
 
 static jint Init(JNIEnv* env, jobject jcaller);
 
-__attribute__((visibility("default"), alias("Init")))
+__attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024MyOtherInnerClass_nativeInit(JNIEnv*
-    env, jobject jcaller);
+    env, jobject jcaller) {
+  return Init(env, jcaller);
+}
 
 };  // extern "C"
 
 // Step 2: method stubs.
 
 extern "C" {
 __attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_nativeStaticMethod(JNIEnv*
     env,
@@ skipping 176 matching lines @@
 "J"
 "I"
 ")"
 "I",
     reinterpret_cast<void*>(Java_org_chromium_example_jni_1generator_SampleForTests_nativeMethod)
     },
 };
 
 static bool RegisterNativesImpl(JNIEnv* env, jclass clazz) {
   if (base::android::IsManualJniRegistrationDisabled()) return true;
-    base::subtle::Release_Store(&g_SampleForTests_clazz,
+
+  base::subtle::Release_Store(&g_SampleForTests_clazz,
       static_cast<base::subtle::AtomicWord>(env->NewWeakGlobalRef(clazz));
 
   const int kMethodsMyOtherInnerClassSize =
       arraysize(kMethodsMyOtherInnerClass);
 
   if (env->RegisterNatives(MyOtherInnerClass_clazz(env),
                            kMethodsMyOtherInnerClass,
                            kMethodsMyOtherInnerClassSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, MyOtherInnerClass_clazz(env), __FILE__);
@@ skipping 23 matching lines @@
   return true;
 }
 
 extern "C" JNIEXPORT bool JNICALL
 Java_org_chromium_example_jni_1generator_SampleForTests_nativeInitNativeClass(JNIEnv*
     env, jclass clazz) {
   return RegisterNativesImpl(env, clazz);
 }
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI