make build with CM

Change-Id: I93b4f6a33facc6bb11974a31a60805725534618c