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

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

Change-Id: Iabaef602b0f2ccb4742732a4ee3f5f4d1de7a3b6