Revert "Reland "Upconvert various types to int.", common_audio portion."

webrtc/common_audio/signal_processing/cross_correlation_neon.c

 /*
  *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 56 matching lines @@
   vst1_lane_s32(cross_correlation, vreinterpret_s32_s64(sum2), 0);
 #endif
 }
 
 /* NEON version of WebRtcSpl_CrossCorrelation() for ARM32/64 platforms. */
 void WebRtcSpl_CrossCorrelationNeon(int32_t* cross_correlation,
                                     const int16_t* seq1,
                                     const int16_t* seq2,
                                     int16_t dim_seq,
                                     int16_t dim_cross_correlation,
-                                    int right_shifts,
-                                    int step_seq2) {
+                                    int16_t right_shifts,
+                                    int16_t step_seq2) {
   int i = 0;
 
   for (i = 0; i < dim_cross_correlation; i++) {
     const int16_t* seq1_ptr = seq1;
     const int16_t* seq2_ptr = seq2 + (step_seq2 * i);
 
     DotProductWithScaleNeon(cross_correlation,
                             seq1_ptr,
                             seq2_ptr,
                             dim_seq,
                             right_shifts);
     cross_correlation++;
   }
 }