am d121d417: am 90ed06ef: Merge "fix 2nd target clang prebuilt paths"

* commit 'd121d417309ab5a4640437a894a501d4883c3961':
  fix 2nd target clang prebuilt paths