Merge "Revert "Add verification of knownfailures in the testrunner"" am: 6639e43cf1 am: 7a671b1490
am: 265156f288

Change-Id: I906f813eb615e107fc116a7c4271815206377c3b