Merge webrtc/video_engine/ into webrtc/video/

WATCHLISTS

Index: WATCHLISTS
diff --git a/WATCHLISTS b/WATCHLISTS
index 72ca3956a01098a0ccf5ee0571ad0a207b1ed1f9..1fa11a7c68f8fd21eaa146a613ba5a6941bc91f6 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -32,9 +32,8 @@
     'java_files': {
       'filepath': '\.java$|\.xml$',
     },
-    'video_engine': {
-      'filepath': 'webrtc/video_engine/.*|'\
-                  'webrtc/video/.*',
+    'video': {
+      'filepath': 'webrtc/video/.*',
     },
     'voice_engine': {
       'filepath': 'webrtc/voice_engine/.*',
@@ -102,14 +101,15 @@
                      'bjornv@webrtc.org',
                      'minyue@webrtc.org',
                      'peah@webrtc.org'],
-    'video_engine': ['andresp@webrtc.org',
-                     'mflodman@webrtc.org',
-                     'perkj@webrtc.org',
-                     'solenberg@webrtc.org',
-                     'stefan@webrtc.org',
-                     'video-team@agora.io',
-                     'yujie.mao@webrtc.org',
-                     'zhengzhonghou@agora.io'],
+    'video': ['andresp@webrtc.org',
+              'mflodman@webrtc.org',
+              'pbos@webrtc.org',
+              'perkj@webrtc.org',
+              'solenberg@webrtc.org',
+              'stefan@webrtc.org',
+              'video-team@agora.io',
+              'yujie.mao@webrtc.org',
+              'zhengzhonghou@agora.io'],
     'voice_engine': ['andrew@webrtc.org',
                      'audio-team@agora.io',
                      'henrika@webrtc.org',