Merge "libaudiohal: Fix broken "legacy audio HAL" build" into oc-dev
am: 8edef79912

Change-Id: Ieec838e8339218438b5d57ea41850147412d344b