fix the mac build

Change-Id: I58ba010150da6ccc062722b975afde0f12b68fc5
Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: scott <scott@ubuntu>

Conflicts:
	config/cm_audio.mk
Merge remote-tracking branch 'upstream/kk44' into kk44