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