Merge "Update makefiles for host clang."