Merge "Include run-test command in script failure output." am: c53ade54 am: 076b0e35 am: 8634c099 am: 804263c8 Change-Id: I235844bcb3663e69742bd473bebcea7d8e265923