no more cm bloat

Conflicts:
	AndroidManifest.xml
	src/com/android/settings/Settings.java
	src/com/android/settings/cmstats/AnonymousStats.java

Conflicts:
	res/values/cm_strings.xml