Add additional directories from which env config can be loaded am: ef073be1

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



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