fix

Conflicts:

	audio/audio_hw_hal.cpp