Merge "Add verification of knownfailures in the testrunner" am: 76c84ce90e am: d439be76ec
am: 7b944427bc

Change-Id: I3084fb9c1db2d837864a91b01fb177a2ec0201b8