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