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

Change-Id: I44d0bab63b27fcb34193d37b2d0962d06276ba01