Merge "No special treatment for vendor" into main am: 7478c9b5c2

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3333873

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