update to candykat and remove cm

Change-Id: I670e21f00ad2574752f60e2b1de0522aa1e7eea2