changes required to build carbon rom

Conflicts:
	cm.dependencies