Merge "Adding odm.img for `fastboot flashall`"