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

Change-Id: I8f87377e82fc9a0067d8d761acb3775eb2c0e6bf