Merge "Fix more potential overflows in amrwbenc" into nyc-dev