Merge "Prototype changes for multitree" am: 184a6b87 am: 91255a65 am:...

Merge "Prototype changes for multitree" am: 184a6b87 am: 91255a65 am: 50da2c45 am: a5acb502 am: ff49472a

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



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