Merge "Remove --multitree-build" into main am: 7c8cf91f am: 33f110f4

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



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