Merge "Add symlink for sort(1)."
am: 95d9665b8f

Change-Id: I713e556e57fee9a4f8357c89cf42382075de5529