Merge "Files under /vendor must have attribute vendor_file_type."