Merge branch 'cm-11.0' of git:CyanogenMod/android_device_samsung_hltevzw