[automerger skipped] Merge "Otadexopt: removing bootdevice from /dev/block/bootdevice/by-name/*" am: 88d73c0286 am: 7f593cfb42  -s ours
am: 2124993631  -s ours

Change-Id: Ib39d74bff2251df70ee9155bd5d3c55ba50309a1