CMAccount: remove Play Services define

Change-Id: I1991ea2ddb9cd4187c738e4a5a560bd6e2bbfe69
Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	Android.mk
Reorganize setup wizard

Google needs to be first.  Show Google page every time, so back
functionality doesn't feel broken.

Change-Id: Iff87700d3b88a3f66108f4e831bf9aec9cf761e5

Conflicts:
	src/com/mokee/setupwizard/ui/SetupWizardActivity.java