Remove CMStats and CMUpdater

Change-Id: If5d8f5cdd69271d03247cff0e0d553fc4344ce53

Conflicts:
	AndroidManifest.xml