Merge "Remove obsolete multitree directory" into main am: 63ce25b55e am: 58b92e124b am: 31aa7c4106

Original change: https://android-review.googlesource.com/c/platform/development/+/2836195

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