Merge "Include run-test command in script failure output."
am: c53ade547d

Change-Id: I9f4828395db1eb371f1bfb8a392c7c4fe2a01c5d