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

Change-Id: I0f77f1fe199905f515e42219ca8f8f7feb1920d6