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