Merge "Testrunner: Print colored text only when printing on terminal" am: fc01c0ff87
am: 0528efeee6

Change-Id: I0bd26c2f7f295622cf1145c7fcac1b3243309228