Merge "Revert^2 "No special treatment for vendor"" into main am: b30ec5be6d

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

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