Add CPU & RAM info.

PS 2 : Cleanup

Change-Id: I0cce559c86321827d6f920d61ad9dfcb34a63b3c

Conflicts:

	res/values/hyperion_strings.xml
	res/xml/device_info_settings.xml
	src/com/android/settings/DeviceInfoSettings.java
Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b