cm clang

Change-Id: Icec99662aeeef904a750282c167052cb6bb870b3