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

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

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