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

Change-Id: I602490e2c0c41d86a2ca9c5c342920682c7ffe90