Merge "Fix builds where dist_goal is defined."