Merge "Remove unused clang.mk file" am: d603cff27d am: cef7a35c04
am: 2ea611df94

Change-Id: I1bb30e5010d727524a5bc2715cbe55b381a60495