Revert of Avoiding overflow in cross correlation in NetEq.

webrtc/modules/audio_coding/neteq/expand.h

Index: webrtc/modules/audio_coding/neteq/expand.h
diff --git a/webrtc/modules/audio_coding/neteq/expand.h b/webrtc/modules/audio_coding/neteq/expand.h
index 44ced0ab6c21e34c2fa502a81f01402cdcfb2a7a..7f61bf3b18c3217bd4406a515267f2b1327b5b96 100644
--- a/webrtc/modules/audio_coding/neteq/expand.h
+++ b/webrtc/modules/audio_coding/neteq/expand.h
@@ -120,10 +120,12 @@
 
   // Calculate the auto-correlation of |input|, with length |input_length|
   // samples. The correlation is calculated from a downsampled version of
-  // |input|, and is written to |output|.
+  // |input|, and is written to |output|. The scale factor is written to
+  // |output_scale|.
   void Correlation(const int16_t* input,
                    size_t input_length,
-                   int16_t* output) const;
+                   int16_t* output,
+                   int* output_scale) const;
 
   void UpdateLagIndex();