Merge "cli-test: a tool for testing command-line programs." am: 5a07ae1422 am: 96f8267eff

Change-Id: Icee24a4218e8791b2ea6cdd4a297f35873afab29