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

Change-Id: I275df525f78ebb7717d2083df87bb1414d762634