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

Change-Id: Icbbe56a2ce8dee311bc6310840bb0bffe6063643