Merge "Adjust known test failures after recent changes in ART test configurations."