Merge "Fix more amrwbenc overflows"