Merge "audiohal: Get rid of multiple inheritance in IDevice implementation" into oc-dev am: 5d3a3fd5a2
am: e27bec3249

Change-Id: Idedc87f29fce7f952a76185308c16e5e1b8958d7