Merge the Sky Engine changes from the SkyDart branch

sky/engine/bindings2/builtin.cc

 // Copyright 2015 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.
 
 #include "sky/engine/config.h"
 #include "sky/engine/bindings2/builtin.h"
 
 #include "base/logging.h"
 #include "dart/runtime/include/dart_api.h"
 #include "gen/sky/bindings/DartGlobal.h"
 #include "sky/engine/bindings2/builtin_natives.h"
 #include "sky/engine/bindings2/builtin_sky.h"
 #include "sky/engine/bindings2/mojo_natives.h"
+#include "sky/engine/tonic/dart_builtin.h"
 
 namespace blink {
 namespace {
 
 struct LibraryDescriptor {
   const char* url;
   bool has_natives;
   Dart_NativeEntrySymbol native_symbol;
   Dart_NativeEntryResolver native_resolver;
 };
@@ skipping 27 matching lines @@
   static_assert(arraysize(kBuiltinLibraries) == kInvalidLibrary,
       "Unexpected number of builtin libraries");
   DCHECK_GE(id, kBuiltinLibrary);
   DCHECK_LT(id, kInvalidLibrary);
   Dart_Handle library = DartBuiltin::LookupLibrary(kBuiltinLibraries[id].url);
   DART_CHECK_VALID(library);
   return library;
 }
 
 }  // namespace blink