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

Change-Id: I96b1982c6ae07d5732155105e370bcf6577eaf76