Merge "Remove obsolete multitree directory" into main am: 63ce25b55e am: 0a5417f8ba

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

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