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

Change-Id: I858710db88f7cfe8761c1d50a795a8417e545e2a