Revert "use caf audio variant again"

This reverts commit a702b09aeb73eeedfb0ea38eae91a48dac807d43.
Merge branch 'cm-11.0' of https://github.com/Mustaavalkosta/android_device_htc_msm7x30-common into cd-4.4