Merge "Adjust known test failures after recent changes in ART test configurations." am: 8f27bafc am: dda3d752 am: 851216db Change-Id: I5389d91847b531953249ddec5766a39213b68b30