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

* commit '8b939a0498b8d24f4a5d7c6e6ac94ddba75ee933':
  Cleaner way to create symlink clang++