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

Change-Id: Ia0b82ff69fdf1ea329b7461797e19f61ad14abf0