Merge "Fix GTestResultParser compatibility"