Merge "Support extra targets for build_vendor script" am: 5ef48d4bab

Original change: https://android-review.googlesource.com/c/platform/development/+/2310469

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