Merge "apex: drop metadata gathering for multitree." am: 9514d5bb am: 5dfe27df

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



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