Merge "Revert "Clean environment variables to account for sandbox work...

Merge "Revert "Clean environment variables to account for sandbox work directory."" into main am: cdd70d26

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



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