Merge "Stop using DIST_DIR directly, use dist-for-goals instead"