Merge "ART-tests: remove DX dependency from 672/673"