adding CM manifests

Change-Id: I8cc17613c90e3ce34e778c0ae76251c9c0771068
renaming CM manifests to match others

Change-Id: I0f68e34ef5fee614172f7d7e5905dedaee833025