Merge "Typos in envsetup.sh."