Add CPU & RAM info to device info settings

PS2 OOOOOOOPStrings
PS3: make strings gooder

Conflicts:

	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java

Change-Id: I1f8bdd0ea148e7de2e14886fc8972870cb26588d

Conflicts:
	res/values/strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java