Revert "Revert "Update envsetup.sh""

This reverts commit f9b14389f61e2d1044899e1330965b5428cc005a.