Merge "ART-tests: Remove DX dependency from 530/583"