Removing CM and adding ChaOS

Change-Id: If8acf32d4cd8a352fd1bdee5add5c304ee8226a3