Merge "Overflow fixes for amrwbenc"