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

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

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