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

Change-Id: I3f080cd0cfba9456dc5f1cff478dd47845cb6b19