Reland "Upconvert various types to int.", ilbc portion.

webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h

Index: webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h b/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
index 64282695a1c32b878eae09eb237e264a2c14ae6a..7f0cadf6e1a1cc930b41eb8777b9a3a0c3c05524 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
+++ b/webrtc/modules/audio_coding/codecs/ilbc/cb_mem_energy_calc.h
@@ -26,7 +26,7 @@ void WebRtcIlbcfix_CbMemEnergyCalc(
     int16_t *ppo,   /* (i) input pointer 2 */
     int16_t *energyW16,  /* (o) Energy in the CB vectors */
     int16_t *energyShifts, /* (o) Shift value of the energy */
-    int16_t scale,   /* (i) The scaling of all energy values */
+    int scale,   /* (i) The scaling of all energy values */
     int16_t base_size  /* (i) Index to where energy values should be stored */
                                    );