Merge "C2SoftOpusEnc: Fix higher bitrate encoding at lower sample rates" into qt-dev
am: 8581d92e21

Change-Id: I1724c202a69755ab65f10b4ff695e581d95184eb