Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_device_samsung_smdk4412-common into cm-11.0

(cherry picked from commit f64c5eabfe90fc75e5cef7c9be4c4b2bb2ce0942)