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

This reverts commit 518c683f3e413523a458a94b533274bd7f29992d.

Breaks Linux-Asan bot
https://uberchromegw.corp.google.com/i/client.webrtc/builders/Linux%20Asan/builds/4348/steps/libjingle_peerconnection_unittest/logs/stdio

BUG=
TBR=aluebs@webrtc.org

Review URL: https://codereview.webrtc.org/1208793002.

Cr-Commit-Position: refs/heads/master@{#9503}
diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index fc0673a..150ee8e 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -161,8 +161,15 @@
             'audio_processing/aec/system_delay_unittest.cc',
             # TODO(ajm): Fix to match new interface.
             # 'audio_processing/agc/agc_unittest.cc',
+            'audio_processing/agc/agc_audio_proc_unittest.cc',
+            'audio_processing/agc/circular_buffer_unittest.cc',
+            'audio_processing/agc/gmm_unittest.cc',
             'audio_processing/agc/histogram_unittest.cc',
             'audio_processing/agc/mock_agc.h',
+            'audio_processing/agc/pitch_based_vad_unittest.cc',
+            'audio_processing/agc/pitch_internal_unittest.cc',
+            'audio_processing/agc/pole_zero_filter_unittest.cc',
+            'audio_processing/agc/standalone_vad_unittest.cc',
             'audio_processing/beamformer/complex_matrix_unittest.cc',
             'audio_processing/beamformer/covariance_matrix_generator_unittest.cc',
             'audio_processing/beamformer/matrix_unittest.cc',
@@ -180,14 +187,6 @@
             'audio_processing/transient/wpd_node_unittest.cc',
             'audio_processing/transient/wpd_tree_unittest.cc',
             'audio_processing/utility/delay_estimator_unittest.cc',
-            'audio_processing/vad/gmm_unittest.cc',
-            'audio_processing/vad/pitch_based_vad_unittest.cc',
-            'audio_processing/vad/pitch_internal_unittest.cc',
-            'audio_processing/vad/pole_zero_filter_unittest.cc',
-            'audio_processing/vad/standalone_vad_unittest.cc',
-            'audio_processing/vad/vad_audio_proc_unittest.cc',
-            'audio_processing/vad/vad_circular_buffer_unittest.cc',
-            'audio_processing/vad/voice_activity_detector_unittest.cc',
             'bitrate_controller/bitrate_allocator_unittest.cc',
             'bitrate_controller/bitrate_controller_unittest.cc',
             'bitrate_controller/send_side_bandwidth_estimation_unittest.cc',