Improve run-test tooling support
am: 8d94dddfd6

Change-Id: Ic4d1770d704ba85923e0250973e6c402fac88515