Merge "Add option to make testrunner ignore knownfailures.json" am: 040fcf1796
am: 3805256f1b

Change-Id: I7468e9dd2e166bc2a27bda4bb519b2fe1e5544ef