Merge "Remove Base_dir from non system non recovery filesystem" into main am:...

Merge "Remove Base_dir from non system non recovery filesystem" into main am: b72c6a74 am: b2559c4a

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



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