Merge "Revert "audiohal: Get rid of multiple inheritance in IDevice implementation"" into oc-dev