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

* commit '90ed06ef84aee84dfc1edba1503a2b2036fc867d':
  fix 2nd target clang prebuilt paths