Quick Settings: Clean up Torch tile (1 of 2)

Change-Id: I1e047278879ef88c71f81c3078760e1d1ff57fbd
Settings: Add NFC Tile to Quick Settings (1 of 2)

Change-Id: I7099c9d29864a3b4f18c60d472cd7e78eb5e11b1

Conflicts:
	res/values/strings.xml
	src/com/android/settings/thinkingbridge/QuickSettings.java
	src/com/android/settings/thinkingbridge/QuickSettingsUtil.java