Revert "Revert "cm: Add CMAccount to the build""

This reverts commit 631022091b7bf1211343e83a27dec009ec3821f5.

Conflicts:
	config/common.mk