Merge "Add OPUS encoding to the framework"
am: 7252ee13be

Change-Id: Ic481569c45e42376467e6b791aa0b42f94151b76