Merge "Files under /vendor must have attribute vendor_file_type." am: 97753529fd
am: 51ba2a7542

Change-Id: Iede82b0125cc17df554a3a263d2e9d15d5444965