totemc2: dis-inherit s4-common

Change-Id: I9d012f00ad1f996998fbd257eee1492b3ebd5602

Conflicts:
	BoardConfig.mk
	device_totemc2.mk
	extract-files.sh
	rootdir/etc/init.target.rc
	setup-makefiles.sh
k2cl: add back BoardConfig.mk
Merge branch 'cm-10.2-testing' of https://github.com/Team-OneSV/android_device_htc_k2_cl into cm-10.2-testing