Merge "Revert "Move ART tests to use D8.""