Fixup symlinks to not use /w/

Change-Id: Id57cc4f5fb9663c3e840ac1f47e780c22a2c44a2
Merge "Fixup symlinks to not use /w/"