Merge "Make dirs a configurable property" into main am: 5c04707a3f

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

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