Merge "Overflow fixes for amrwbenc"
am: eb0482990a

* commit 'eb0482990aaf115ac351cbf8751d7536cb5036d4':
  Overflow fixes for amrwbenc