Revert "remove DeviceSettings"

This reverts commit 5772991bb79abf86a62bd8c9cc2452e3584cc528.

Conflicts:
	common.mk