Merge video_engine_core into webrtc target.

webrtc/webrtc.gyp

Index: webrtc/webrtc.gyp
diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp
index 1ecc0cd708e76917932ca3d2fc287d6c7f1d2707..b1574d22a6178e94a3b723ee5976084d808257f7 100644
--- a/webrtc/webrtc.gyp
+++ b/webrtc/webrtc.gyp
@@ -32,7 +32,6 @@
       'p2p/p2p.gyp:*',
       'system_wrappers/system_wrappers.gyp:*',
       'tools/tools.gyp:*',
-      'video_engine/video_engine.gyp:*',
       'voice_engine/voice_engine.gyp:*',
       '<(webrtc_vp8_dir)/vp8.gyp:*',
       '<(webrtc_vp9_dir)/vp9.gyp:*',
@@ -50,12 +49,13 @@
         ['include_tests==1', {
           'dependencies': [
             'common_video/common_video_unittests.gyp:*',
+            'rtc_unittests',
             'system_wrappers/system_wrappers_tests.gyp:*',
             'test/metrics.gyp:*',
             'test/test.gyp:*',
             'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
+            'video_engine/video_engine_core_unittests.gyp:video_engine_core_unittests',
             'webrtc_tests',
-            'rtc_unittests',
           ],
         }],
       ],