Merge "Cleaner way to create symlink clang++"