Back to vanir audio confs, and redundant (but functional) acdbs

Change-Id: Ib675ccc5a19070b9ad3bb47b7531e0c7c7dbad8b