Revert "boardconfig: moving back to CAF audio variant"

This reverts commit ad9296327e7f11093e466f4ae62b7de5bf149213.

Change-Id: Idb3898cd725dc69d45419a3fb89aa309b1a75893
Merge "Revert "boardconfig: moving back to CAF audio variant"" into cm-10.1