Merge "Revert "Remove DIST_DIR uses in ART.""