Merge "Add rm(1) symlink."
am: 7acdcbb8af

Change-Id: I5f1b15b389b0efde31210eea658732a8f4627bfd