Merge "Fix overflow in amrwbenc" am: b135d0e6fb
am: 9f2e05eb78

* commit '9f2e05eb78524d30b4196cc635bb16daf7557428':
  Fix overflow in amrwbenc