Enable Torch (again :P )

Change-Id: Id571591c2b25e133021b06a509ba91bc3f264198

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