Revert "Revert "Update envsetup.sh""

This reverts commit 41c0a12560bfbc5b6b4593a01bbb7729deeb26cc.