Merge "Label /vendor_file_contexts as file_contexts_file"
am: a0e50d0b56

Change-Id: I868f7f5e0e11e4a8926d6e2b40b042b8d81d2d3d