Merge "fix 2nd target clang prebuilt paths"