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

Change-Id: I77d339294f116cbdd1279442b59e6ca8b295e175