Revert "Update envsetup.sh"

This reverts commit 915f89d04554155bd1514e078b11099798d3c464.
Revert "Update envsetup.sh"

This reverts commit 960b15426df9f6144ccacf2189ce4415981a0c9c.