Remove dead symlinks when merging directories
Remove dead symlinks when merging directories

BUG=none
R=bradnelson@chromium.org

Review URL: https://codereview.chromium.org/1274273002

sbc100/native_client,sbc100/native_client,sbc100/native_client,sbc100/native_client,sbc100/native_client,sbc100/native_client