Merge "Testrunner: Fix output parsing issue" am: cd29b3b2b2 am: 6f1bf60243
am: 7cded13c96

Change-Id: Ib5dac6058427b6bdd90543a690c0643ac3001e00