am 884f5e14: am 638a2b2d: am 8224edb9: Merge "Update makefile for clang host build."

* commit '884f5e1411655f096f6d1f4c16399d15c6ce24ab':
  Update makefile for clang host build.