Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate"