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

Change-Id: I9ea0f9bb5b8230427cfa705bb012e1045094b5c3