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

Change-Id: Id618a6d2d483e805a3ad9d6991d2ae782de00da3