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

Change-Id: I80994ace09a7f3a3e455733737cc0c00d01c500a