Merge "Add xargs(1) symlink." am: f4b7db3138
am: 3ec200f12b

Change-Id: I7ff0bc765f93a29cdea002dcfa0adde04b78de9d