Revert "Transfer remainder of cm repos to cm manifest"

This reverts commit 3c16f1db83cc047f78b387c70f53ac27e635a849.