Update from https://crrev.com/318214

base/android/jni_generator/testNativeExportsOptionalOption.golden

Index: base/android/jni_generator/testNativeExportsOptionalOption.golden
diff --git a/base/android/jni_generator/testNativeExportsOptionalOption.golden b/base/android/jni_generator/testNativeExportsOptionalOption.golden
index 2a3b172dc83f13b948ff835c89bb8d5bbd6a2f5e..f47cb98e187256f6f41170bb9496d88945b38012 100644
--- a/base/android/jni_generator/testNativeExportsOptionalOption.golden
+++ b/base/android/jni_generator/testNativeExportsOptionalOption.golden
@@ -30,17 +30,21 @@ 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"
 
@@ -237,7 +241,8 @@ static const JNINativeMethod kMethodsSampleForTests[] = {
 
 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 =