Switch to audio-caf properly

Change-Id: I2c4fdeceed4a4253667dc447b6ea9b7a3fc3b8f0