Merge from github.com/CyanogenMod/android_device_samsung_hlte into cm-11.0