Update cran_env_vars to match latest r-source trunk