Merge "Testrunner: Fix output parsing issue"
am: cd29b3b2b2

Change-Id: I757f92c4d79fb5b0d73053b513a62cfe0623b9a7