Merge changes from topic "revert_vendor" am: 3e2760a539

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1556737

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7dcd298dcd104a7edc649ffc658e29b95c6e780