Update from https://crrev.com/317530

base/android/jni_android.h

Index: base/android/jni_android.h
diff --git a/base/android/jni_android.h b/base/android/jni_android.h
index b5e55263e0e6e0fbdc3c951361b663351f2fc748..504eb85707e28283113d67e834bc32867441fdfe 100644
--- a/base/android/jni_android.h
+++ b/base/android/jni_android.h
@@ -21,6 +21,13 @@ namespace android {
 // Used to mark symbols to be exported in a shared library's symbol table.
 #define JNI_EXPORT __attribute__ ((visibility("default")))
 
+// Used to disable manual JNI registration in binaries that prefer to use native
+// JNI exports for startup performance. This is not compatible with the crazy
+// linker and so defaults to off. Call DisableManualJniRegistration at the very
+// beginning of JNI_OnLoad to use this.
+BASE_EXPORT bool IsManualJniRegistrationDisabled();
+BASE_EXPORT void DisableManualJniRegistration();
+
 // Contains the registration method information for initializing JNI bindings.
 struct RegistrationMethod {
   const char* name;