Merge "Fix Opus encoder being set to CBR" into qt-dev
am: d609aa158a

Change-Id: If457ed7604890acac3eacfc99d8a21bc200c4bb2