Revert "Track some cm-11.0 branches until cm-12.0 staging is complete"

This reverts commit b8d91b4b4f5d176da9b56881a7d0443c87157dd4.

Conflicts:
	cm.dependencies

Change-Id: Id8809ff63b48375ad6c565e02b46593799817c6b