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