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

Change-Id: I101943359421f8a4652fba2c53a45517f34ab23c