Complete removing cm(4) following r332490 and r332500.
This fixes LINT builds.
Committed independently in rS332512.