Revert "Update envsetup.sh"

This reverts commit 7ac06f06e0777455353f71c3dc880c300d43e35d.
Revert "Revert "Revert "Update envsetup.sh"""

This reverts commit 9d33192768063f030d74e8830465dc4d67227ddb.
Revert "Revert "Update envsetup.sh""

This reverts commit 41c0a12560bfbc5b6b4593a01bbb7729deeb26cc.