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

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

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