Merge "Testrunner: Return exit code 1 when test fails." am: 560c6a27a0
am: 356b2d913b

Change-Id: I6a3a3d4c71217e787e59964de87df2b5dacbfd13