Merge "Remove dist-for-goals call for gtests."