Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_DSPManager into kk44

Change-Id: I88efc64e891845986ff1769af9fa318068dd8df7