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

Change-Id: Ic62080ca1a883f765e0939e3acfc2d7137f6e57b