Merge brach cm-11.0 with CyanogenMod/android_device_samsung_qcom-common cm-11.0