Merge "audiohal: Fix compilation error"