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

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

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