Update from https://crrev.com/309415

base/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 243 matching lines @@
     "ios/weak_nsobject.h",
     "ios/weak_nsobject.mm",
     "json/json_file_value_serializer.cc",
     "json/json_file_value_serializer.h",
     "json/json_parser.cc",
     "json/json_parser.h",
     "json/json_reader.cc",
     "json/json_reader.h",
     "json/json_string_value_serializer.cc",
     "json/json_string_value_serializer.h",
+    "json/json_value_converter.cc",
     "json/json_value_converter.h",
     "json/json_writer.cc",
     "json/json_writer.h",
     "json/string_escape.cc",
     "json/string_escape.h",
     "lazy_instance.cc",
     "lazy_instance.h",
     "linux_util.cc",
     "linux_util.h",
     "location.cc",
@@ skipping 1254 matching lines @@
   # GYP: //base.gyp:base_unittests_apk
   unittest_apk("base_unittests_apk") {
     deps = [
       ":base_java",
       ":base_java_unittest_support",
       ":base_unittests",
     ]
     unittests_dep = ":base_unittests"
   }
 }