diff --git a/BUILD.gn b/BUILD.gn
index 4a71e5550f6c..993a47c86116 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,5 +1,6 @@
 import("//build/config/locales.gni")
 import("//tools/grit/repack.gni")
+import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("build/asar.gni")
 import("build/npm.gni")
 
@@ -26,7 +27,7 @@ declare_args() {
 
   enable_desktop_capturer = true
   enable_run_as_node = true
-  enable_osr = true
+  enable_osr = false
 }
 
 filenames_gypi = exec_script(
@@ -176,6 +177,12 @@ action("atom_js2c") {
 
 asar("js2asar") {
   sources = filenames_gypi.js_sources
+  if (enable_desktop_capturer) {
+    sources += [
+      "lib/browser/desktop-capturer.js",
+      "lib/renderer/api/desktop-capturer.js",
+    ]
+  }
   outputs = [ "$root_out_dir/resources/electron.asar" ]
   root = "lib"
 }
@@ -205,6 +212,7 @@ static_library("electron_lib") {
     "//components/prefs",
     "//components/printing/common",
     "//components/security_state/content",
+    "//components/viz/service",
     "//content/public/browser",
     "//device/geolocation",
     "//gin",
@@ -220,9 +228,8 @@ static_library("electron_lib") {
     "//third_party/crashpad/crashpad/client",
     "//third_party/leveldatabase",
     "//third_party/libyuv",
-    "//third_party/webrtc/modules/desktop_capture",
-    "//third_party/webrtc/modules/desktop_capture:primitives",
     "//ui/events:dom_keycode_converter",
+    "//ui/gl",
     "//ui/views",
     "//v8",
     ":atom_js2c",
@@ -233,7 +240,6 @@ static_library("electron_lib") {
   if (is_mac) {
     deps += [
       "//ui/accelerated_widget_mac",
-      "//base/allocator:features",
     ]
   }
   if (is_linux) {
@@ -389,11 +395,14 @@ if (is_mac) {
       public_deps += [ "//third_party/icu:icudata" ]
     }
     if (v8_use_external_startup_data) {
-      sources += [
-        "$root_out_dir/natives_blob.bin",
-        "$root_out_dir/snapshot_blob.bin",
-      ]
+      sources += [ "$root_out_dir/natives_blob.bin" ]
       public_deps += [ "//v8" ]
+      if (use_v8_context_snapshot) {
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+        public_deps += [ "//tools/v8_context_snapshot" ]
+      } else {
+        sources += [ "$root_out_dir/snapshot_blob.bin" ]
+      }
     }
     outputs = [
       "{{bundle_resources_dir}}/{{source_file_part}}",
diff --git a/DEPS b/DEPS
index 58022197e242..f018c745ae45 100644
--- a/DEPS
+++ b/DEPS
@@ -13,6 +13,13 @@ vars = {
 
   'electron_git':
     'https://github.com/electron',
+
+  'checkout_nacl':
+    False,
+  'checkout_libaom':
+    True,
+  'checkout_oculus_sdk':
+    False,
 }
 
 deps = {
@@ -60,3 +67,10 @@ recursedeps = [
   'src',
   'src/libchromiumcontent',
 ]
+
+gclient_gn_args = [
+  'checkout_libaom',
+  'checkout_nacl',
+  'checkout_oculus_sdk'
+]
+gclient_gn_args_file =  'src/build/config/gclient_args.gni'
diff --git a/build/node/BUILD.gn b/build/node/BUILD.gn
index 59a181b1ac66..26ec8f6a6e8b 100644
--- a/build/node/BUILD.gn
+++ b/build/node/BUILD.gn
@@ -38,12 +38,6 @@ action("gyp_node") {
     "$target_out_dir/Release/build.ninja",
   ]
 
-  # TODO(jeremy): should shlib_suffix be set inside node.gypi?
-  if (is_mac) {
-    shlib_suffix = "dylib"
-  } else if (is_linux) {
-    shlib_suffix = "so"
-  }
   args = [
     "-I", rebase_path("$target_gen_dir/config.gypi", root_build_dir),
     "-I", rebase_path("node_override.gypi", root_build_dir),
diff --git a/build/node/node_override.gypi b/build/node/node_override.gypi
index 01ff4ff24978..166c528cb324 100644
--- a/build/node/node_override.gypi
+++ b/build/node/node_override.gypi
@@ -27,13 +27,9 @@
           '../../../../../../libicuuc.dylib',
         ],
         'defines': [
-          # These will no longer be necessary once
-          # https://github.com/google/boringssl/commit/a02ed04d527e1b57b4efaa0b4f9bdbc1ed5975b2
-          # is in the past for Electron
-          'EVP_CIPH_CCM_MODE=0',
-          'EVP_CIPH_WRAP_MODE=0',
-          'EVP_CIPHER_CTX_FLAG_WRAP_ALLOW=0',
-          'EVP_CIPHER_CTX_set_flags(...)',
+          'EVP_CTRL_AEAD_SET_IVLEN=EVP_CTRL_GCM_SET_IVLEN',
+          'EVP_CTRL_CCM_SET_TAG=EVP_CTRL_GCM_SET_TAG',
+          'EVP_CTRL_AEAD_GET_TAG=EVP_CTRL_GCM_GET_TAG',
         ],
       }],
     ],