Merge "libcutils: fs_config.c mark vendor, odm and oem partitions in duplicate" am: 43e9106410 am: 2eecd3ab99 am: c092331130
am: d3f16131fa

Change-Id: I3fbc7e0d1812289200b6c3069ae14347db37a830