Merge "Fix overflows in amrwbenc" am: bcd54f426f
am: caf74f7732

* commit 'caf74f7732bcea4fb1a574fe01d93dcf80423cea':
  Fix overflows in amrwbenc