Add missing dependencies and remove some CM files.

Change-Id: I1d46f6461fd6fd33d012149824bb08912009da05