Merge "Remove obsolete clang makefiles"