Revert "Cm repos to cm manifest"

This reverts commit 42babb2067300ea60df0cdd080168ec4994e620a.
Revert "Move aosp to it's own manifest"

This reverts commit 5a37033a9b8f8dbac82f6915a56203cc641a5b44.