Merge "Removing block device by-num symlinks"
am: 6aaa3beb39

Change-Id: If37fe44b7eeaf45821caff21809b8173d23a5105