Merge "Adding odm.img for `fastboot flashall`" am: cdc553d042 am: b526c2f785
am: 85fc6a91c0

Change-Id: Iadad34605a7d537c401818f51d5e109bafc61cae