Merge "Mark vendor executables as vendor_file_type."