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

Change-Id: I7274d9f71ce0bc5457598a236bab48892a94d0df