Merge "ueventd: support by-name symlinks for virtual block devices" am: 0b4d34e31c
am: 4d003658ec

Change-Id: Id1b3af33eb30212c1569ec8eb6298cb2de477d01