Merge "Fix AMRWBEnc overflow" into nyc-dev