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

Change-Id: I924836d44a708d0e6b4964fa49cfac48fa6d5fc3