Merge "Allow sourcing envsetup from anywhere" am: 0e462442 am: 596a630c

Original change: https://android-review.googlesource.com/c/platform/build/+/2097636



Change-Id: I1470f163980b57d0c56f9dcb00f3692b3f8c8cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>