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

Conflicts:
	rootdir/init.smdk4x12.rc

(cherry picked from commit f2d7003d8dcabaf3253cd6273992d7599594421e)