Merge "Label /vendor_file_contexts as file_contexts_file" am: a0e50d0b56
am: 5759bcccbb

Change-Id: I80a4265f9d252ac79e78a0bc4fb378769e26e9ef