Merge "audio HAL: fix master-without-vendor build."