- Proper inclusion of gypi files, so that they do not override

vm/dart_api_impl_test.cc

Index: vm/dart_api_impl_test.cc
===================================================================
--- vm/dart_api_impl_test.cc	(revision 5503)
+++ vm/dart_api_impl_test.cc	(working copy)
@@ -2827,7 +2827,6 @@
       "    return obj;\n"
       "  }\n"
       "}\n";
-  Dart_Handle result;
   const int kNumNativeFields = 4;
 
   // Create a test library.
@@ -2835,10 +2834,11 @@
                                              native_field_lookup);
 
   // Create a native wrapper class with native fields.
-  result = Dart_CreateNativeWrapperClass(
+  Dart_Handle result = Dart_CreateNativeWrapperClass(
       lib,
       Dart_NewString("NativeFieldsWrapper"),
       kNumNativeFields);
+  EXPECT_VALID(result);
 
   // Load up a test script in it.