am 4795ce06: Merge "Update makefiles for host clang."

* commit '4795ce066024c7ab235cb0c6bb229b0b6d9e5878':
  Update makefiles for host clang.