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

Change-Id: I0b519a6d234e3d2c7b957d5f6d8e25a73b60dd79