Merge "Fix yet more overflows in amrwbenc" into nyc-dev am: b4f67b37e9 am: bcd5792162
am: c75d98fea8

* commit 'c75d98fea85b8bd32dc3625f912312aea3ebc35e':
  Fix yet more overflows in amrwbenc

Change-Id: I01d9039a5d205ce9a54f134be7c5c059baec49a5