Merge "Overflow fixes for amrwbenc" am: eb0482990a
am: 520603c886

* commit '520603c88667df38616724f6c963a5a422bd2856':
  Overflow fixes for amrwbenc