incorporate the add_env_variable function in do_expand_env.

I see no real reason to use an extra function call here (other than
decreasing performance :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100891 13f79535-47bb-0310-9956-ffa450edef68