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

Change-Id: Iad78f4366d0c2311a472aadcf0cf07227d3d71e7