Fix CPU/MEM infos

Conflicts:
	src/com/android/settings/DeviceInfoSettings.java