Disable s2w/dt2w when magnetic cover is used

Conflicts:
	drivers/input/lid.c
	drivers/input/touchscreen/ektf3k.c
	include/linux/sweep2wake.h
Merge branch 'cm-11.0' of github.com:grondinm/android_kernel_google_msm into cm-11.0