Merge "Be more careful about symlinking a file that actually exists on the host."
am: 3498578c4c

Change-Id: Icf731c09c568f4062353d3e52c0cccc77cba57e8