Merge "Fix testrunner.py reporting"
am: 7ac79b99c0

Change-Id: I34f28afdb7f9d167e1e1aac6d7a9243f1ac3f81b