Reland of Merge webrtc/video_engine/ into webrtc/video/

webrtc/video/webrtc_video.gypi

Index: webrtc/video/webrtc_video.gypi
diff --git a/webrtc/video/webrtc_video.gypi b/webrtc/video/webrtc_video.gypi
index 87876e38631bf43f3f38158d778ca70df8df17f3..db8d5c7e8902caa75982b0f758f70b0716bcc74e 100644
--- a/webrtc/video/webrtc_video.gypi
+++ b/webrtc/video/webrtc_video.gypi
@@ -24,12 +24,24 @@
       '<(webrtc_root)/webrtc.gyp:rtc_event_log',
     ],
     'webrtc_video_sources': [
+      'video/call_stats.cc',
+      'video/call_stats.h',
       'video/encoded_frame_callback_adapter.cc',
       'video/encoded_frame_callback_adapter.h',
+      'video/encoder_state_feedback.cc',
+      'video/encoder_state_feedback.h',
+      'video/overuse_frame_detector.cc',
+      'video/overuse_frame_detector.h',
+      'video/payload_router.cc',
+      'video/payload_router.h',
       'video/receive_statistics_proxy.cc',
       'video/receive_statistics_proxy.h',
+      'video/report_block_stats.cc',
+      'video/report_block_stats.h',
       'video/send_statistics_proxy.cc',
       'video/send_statistics_proxy.h',
+      'video/stream_synchronization.cc',
+      'video/stream_synchronization.h',
       'video/video_capture_input.cc',
       'video/video_capture_input.h',
       'video/video_decoder.cc',
@@ -38,28 +50,16 @@
       'video/video_receive_stream.h',
       'video/video_send_stream.cc',
       'video/video_send_stream.h',
-      'video_engine/call_stats.cc',
-      'video_engine/call_stats.h',
-      'video_engine/encoder_state_feedback.cc',
-      'video_engine/encoder_state_feedback.h',
-      'video_engine/overuse_frame_detector.cc',
-      'video_engine/overuse_frame_detector.h',
-      'video_engine/payload_router.cc',
-      'video_engine/payload_router.h',
-      'video_engine/report_block_stats.cc',
-      'video_engine/report_block_stats.h',
-      'video_engine/stream_synchronization.cc',
-      'video_engine/stream_synchronization.h',
-      'video_engine/vie_channel.cc',
-      'video_engine/vie_channel.h',
-      'video_engine/vie_encoder.cc',
-      'video_engine/vie_encoder.h',
-      'video_engine/vie_receiver.cc',
-      'video_engine/vie_receiver.h',
-      'video_engine/vie_remb.cc',
-      'video_engine/vie_remb.h',
-      'video_engine/vie_sync_module.cc',
-      'video_engine/vie_sync_module.h',
+      'video/vie_channel.cc',
+      'video/vie_channel.h',
+      'video/vie_encoder.cc',
+      'video/vie_encoder.h',
+      'video/vie_receiver.cc',
+      'video/vie_receiver.h',
+      'video/vie_remb.cc',
+      'video/vie_remb.h',
+      'video/vie_sync_module.cc',
+      'video/vie_sync_module.h',
     ],
   },
 }