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

Change-Id: I494835f7dc4ee93bb72b985228d12e915dd60031