Merge "Remove unnecessary base_dir property value overrides" into main am:...

Merge "Remove unnecessary base_dir property value overrides" into main am: 385f75bf am: dc04941c

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



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