Merge remote-tracking branch \'toybox/master\' into HEAD

am: 1c046ba85a

* commit '1c046ba85afc8af804e9c9529517eef9d55273b6':
  Add -o TNAME for android, fix display of last field (retain left justifification when trimmed for screen width), make ARGS path trimming logic work with spaces in path.
  Stabilize another sort.
  Stand alone builds of OLDTOY should show help text for corresponding NEWTOY.

Change-Id: Icc43b91509855c97e31c790476252c56f62708a3