Merge from github.com:CyanogenMod/android_device_samsung_hltevzw into cm-11.0