Merge "Add verification of knownfailures in the testrunner" am: 14f01c28d7
am: 6e85ed8009

Change-Id: Iae22c11ad626f20fc6f6ac367f8b12fdac53e40c