Update from https://crrev.com/314320

base/BUILD.gn

Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index b31fed150b73c1a0c2e13d30767ba2a176d7bb75..c1df2ec30d2f34ba72c91172904ccad59e3bcdd9 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -23,6 +23,8 @@ component("base") {
     "allocator/type_profiler_control.h",
     "android/application_status_listener.cc",
     "android/application_status_listener.h",
+    "android/base_jni_onload.cc",
+    "android/base_jni_onload.h",
     "android/base_jni_registrar.cc",
     "android/base_jni_registrar.h",
     "android/build_info.cc",
@@ -46,6 +48,7 @@ component("base") {
     "android/jni_android.h",
     "android/jni_array.cc",
     "android/jni_array.h",
+    "android/jni_onload_delegate.h",
     "android/jni_registrar.cc",
     "android/jni_registrar.h",
     "android/jni_string.cc",
@@ -900,7 +903,6 @@ component("base") {
       "native_library_posix.cc",
       "strings/sys_string_conversions_posix.cc",
     ]
-    deps += [ "//third_party/mach_override" ]
   } else {
     # Non-Mac.
     sources -= [