Revert "Revert "Update envsetup.sh""

This reverts commit 93506a79ea2dceb658c84fbab5a3e00540c33e4c.