Merge "C2SoftAmrNbEnc:  Fix integer overflows leading to crash by changing data type"