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

Change-Id: I8278fa28d430dc17f4e45b263314643ecb27631d