Revert "Pull the Voice Activity Detector out from the AGC"

webrtc/modules/audio_processing/audio_processing.gypi

Index: webrtc/modules/audio_processing/audio_processing.gypi
diff --git a/webrtc/modules/audio_processing/audio_processing.gypi b/webrtc/modules/audio_processing/audio_processing.gypi
index 85415fdbe5d2148783b92608e3efc02080c7a5a5..8eb277503faf1deef3379bc38c93f18c3e0fcb3b 100644
--- a/webrtc/modules/audio_processing/audio_processing.gypi
+++ b/webrtc/modules/audio_processing/audio_processing.gypi
@@ -48,9 +48,17 @@
         'aecm/include/echo_control_mobile.h',
         'agc/agc.cc',
         'agc/agc.h',
+        'agc/agc_audio_proc.cc',
+        'agc/agc_audio_proc.h',
+        'agc/agc_audio_proc_internal.h',
         'agc/agc_manager_direct.cc',
         'agc/agc_manager_direct.h',
+        'agc/circular_buffer.cc',
+        'agc/circular_buffer.h',
+        'agc/common.h',
         'agc/gain_map_internal.h',
+        'agc/gmm.cc',
+        'agc/gmm.h',
         'agc/histogram.cc',
         'agc/histogram.h',
         'agc/legacy/analog_agc.c',
@@ -58,8 +66,18 @@
         'agc/legacy/digital_agc.c',
         'agc/legacy/digital_agc.h',
         'agc/legacy/gain_control.h',
+        'agc/noise_gmm_tables.h',
+        'agc/pitch_based_vad.cc',
+        'agc/pitch_based_vad.h',
+        'agc/pitch_internal.cc',
+        'agc/pitch_internal.h',
+        'agc/pole_zero_filter.cc',
+        'agc/pole_zero_filter.h',
+        'agc/standalone_vad.cc',
+        'agc/standalone_vad.h',
         'agc/utility.cc',
         'agc/utility.h',
+        'agc/voice_gmm_tables.h',
         'audio_buffer.cc',
         'audio_buffer.h',
         'audio_processing_impl.cc',
@@ -113,26 +131,6 @@
         'utility/delay_estimator_internal.h',
         'utility/delay_estimator_wrapper.c',
         'utility/delay_estimator_wrapper.h',
-        'vad/common.h',
-        'vad/gmm.cc',
-        'vad/gmm.h',
-        'vad/noise_gmm_tables.h',
-        'vad/pitch_based_vad.cc',
-        'vad/pitch_based_vad.h',
-        'vad/pitch_internal.cc',
-        'vad/pitch_internal.h',
-        'vad/pole_zero_filter.cc',
-        'vad/pole_zero_filter.h',
-        'vad/standalone_vad.cc',
-        'vad/standalone_vad.h',
-        'vad/vad_audio_proc.cc',
-        'vad/vad_audio_proc.h',
-        'vad/vad_audio_proc_internal.h',
-        'vad/vad_circular_buffer.cc',
-        'vad/vad_circular_buffer.h',
-        'vad/voice_activity_detector.cc',
-        'vad/voice_activity_detector.h',
-        'vad/voice_gmm_tables.h',
         'voice_detection_impl.cc',
         'voice_detection_impl.h',
       ],