Merge "Remove DIST_DIR uses in ART."