Merge "ueventd: populate /dev/block/mapper link" am: 5c811fd01a am: ee32edb306
am: ae0c91dad4

Change-Id: I00cf5253eb00976f38792aef63b72f9216c6cc2f