Update device-proprietary-files.txt
Update slim.mk
Conflicts:
	slim.mk
Update device.mk
Conflicts:
	device.mk
Update slim.dependencies
Conflicts:
	slim.dependencies
Update system.prop
Update slim.dependencies
Conflicts:
	slim.dependencies