am 60fb0eb8: Merge "Cleaner way to create symlink clang++"

* commit '60fb0eb8efff3960daaa5f6ca23626116b1ab47d':
  Cleaner way to create symlink clang++