[automerger skipped] Merge "Adding odm.img for `fastboot flashall`" into pi-dev
am: 6c4ed57065  -s ours

Change-Id: I72ae9fe578da0416d8834249bf9e869ab0813221