manifest: track more cm's stuff
Merge branch 'kk-remote' into kk