Merge "Allow sourcing envsetup from anywhere"