Merge "Fix executable symlinks."