Revert "Upconvert various types to int."

This reverts commit 83ad33a8aed1fb00e422b6abd33c3e8942821c24.

BUG=499241
TBR=hlundin

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

Cr-Commit-Position: refs/heads/master@{#9418}

webrtc/modules/audio_coding/codecs/ilbc/cb_search.c

@@ -46,9 +46,7 @@ void WebRtcIlbcfix_CbSearch(
     int16_t block  /* (i) the subblock number */
                             ) {
   int16_t i, j, stage, range;
-  int16_t *pp;
-  int16_t tmp;
-  int scale;
+  int16_t *pp, scale, tmp;
   int16_t bits, temp1, temp2;
   int16_t base_size;
   int32_t codedEner, targetEner;