Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_hardware_qcom_audio-caf into kk
Merge branch 'kk' of https://github.com/marlontoe/android_hardware_qcom_audio-caf into kk