fork cm clang

Change-Id: I74ea6cfd65f3a75d46ec42153629db588174913a