am abdf2b44: (-s ours) am 92bb84b1: Update makefiles for clang host builds. DO NOT MERGE

* commit 'abdf2b44d5b85158cac31342273bc515d0083f90':
  Update makefiles for clang host builds. DO NOT MERGE