Merge "testrunner: Speed up printing --help by 4x" am: 806ac631e5
am: 19046ffceb

Change-Id: I72ca47f3b3b1f0ab3cf0558337cebde9c842f045