Merge "Otadexopt: removing bootdevice from /dev/block/bootdevice/by-name/*"