Update device.mk
Conflicts:
	device.mk