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

Change-Id: I989a6b747c18faeab6ccdc8cdc394f5645649faf