Revert "Switch to audio-caf"

This reverts commit aba9071ab30b48d67d44c5c9f4692985301ea4e8.

Conflicts:
	BoardConfigCommon.mk

Change-Id: I2fe04c935a9c827d31cf6aae255615e6f39bfa10