changes for slimrom

Change-Id: I58d63391a492bd0e1fe31a70dc9c529d6539f888

Conflicts:
	overlay/packages/apps/Settings/res/values/config.xml
	slim.mk

Conflicts:
	overlay/packages/apps/Settings/res/values/config.xml