Cleanup

Conflicts:
	BoardConfig.mk
	cm.mk
	device_doubleshot.mk
	system.prop