Merge "Fix build_vendor script bug"