Revert "audio_processing/aec: make delay estimator aware of starving farend buffer"

webrtc/modules/audio_processing/aec/echo_cancellation.c

Index: webrtc/modules/audio_processing/aec/echo_cancellation.c
diff --git a/webrtc/modules/audio_processing/aec/echo_cancellation.c b/webrtc/modules/audio_processing/aec/echo_cancellation.c
index 106233d68284dcba9402f420952b524f72069236..a39fd2c9d5a53e7c6bc1d0d4368823d13044cd4d 100644
--- a/webrtc/modules/audio_processing/aec/echo_cancellation.c
+++ b/webrtc/modules/audio_processing/aec/echo_cancellation.c
@@ -718,7 +718,9 @@ static int ProcessNormal(Aec* aecpc,
     }
   } else {
     // AEC is enabled.
-    EstBufDelayNormal(aecpc);
+    if (WebRtcAec_reported_delay_enabled(aecpc->aec)) {
+      EstBufDelayNormal(aecpc);
+    }
 
     // Call the AEC.
     // TODO(bjornv): Re-structure such that we don't have to pass
@@ -793,7 +795,9 @@ static void ProcessExtended(Aec* self,
     self->startup_phase = 0;
   }
 
-  EstBufDelayExtended(self);
+  if (WebRtcAec_reported_delay_enabled(self->aec)) {
+    EstBufDelayExtended(self);
+  }
 
   {
     // |delay_diff_offset| gives us the option to manually rewind the delay on