Update the GMS location provider name

Change-Id: I8703838c9c2ce703e32f358edc1f1d73558b47e0
Add hh:mm to CM_VERSION for non-release builds

Conflicts:
	config/common.mk
Remove CM_BUILDTYPE from CM_VERSION for non-release builds

Conflicts:
	config/common.mk
Revert "cm: Add CMAccount to the build"

This reverts commit b6f18ffe8a5dd7125ff231223fc5a31ad5430049.
Move CM_EXTRAVERSION to the end of CM_VERSION