Merge "Update makefile for clang host build."