Merge "Revert "No special treatment for vendor"" into main am: 2876a2cc88

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

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