Merge "Allow system_server to read vendor_file"