Merge "Testrunner: Handle case when test_info line exceeds console length" am: c631854b43
am: 15e236e2db

Change-Id: I9d380408aab0151b75639e339f7fdc570837a2e8