merge from https://github.com/CyanogenMod/android_device_samsung_hlte.git into cm-11.0