Merge "Support extra targets for build_vendor script"