Fix cherry-pick

or at-least try...
Add Google Analytics support.

Change-Id: I81f816f2a358a36247c05a97053e948f4ea62753

Conflicts:
	Android.mk

Conflicts:
	src/com/android/settings/cmstats/ReportingService.java
Revert "Add Google Analytics support."

This reverts commit 642d9e2677d5efa9bce99dbafd1931264c9289aa.