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

Change-Id: Ieec9dd04d8dbc3fcf348a118529f168f710426cf