Merge "ART: Retire desugar and dx in run-tests"