Merge branch 'cm/stable/cm-11.0'

Conflicts:
	overlay/packages/apps/Camera2/res/values/config.xml
	rootdir/fstab.smdk4210
	rootdir/init.smdk4210.rc