Merge "Fix integer overflow in amrwbdec" into nyc-dev