Merge "Add cp(1) symlink."
am: 78747dfed6

Change-Id: I4779b1a556e7491134f98aed709edee3292d635a